mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8'

Browse Source
This commit is contained in:
louiz’
2018-05-23 01:17:36 +02:00
parent ad1c63b129 d3eda68761
commit 68d86a9daa
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xmpp/biboumi_adhoc_commands.cpp
+2 -1
View File
@@ -232,6 +232,7 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
XmlSubNode instructions(x, "instructions");
instructions.set_inner("Edit the form, to configure the settings of the IRC server " + server_domain);
if (Config::get("fixed_irc_server", "").empty())
{
XmlSubNode field(x, "field");
field["var"] = "address";
@@ -411,7 +412,7 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
const XmlNode* value = field->get_child("value", "jabber:x:data");
const std::vector<const XmlNode*> values = field->get_children("value", "jabber:x:data");
if (field->get_tag("var") == "address" && value)
if (field->get_tag("var") == "address" && value && Config::get("fixed_irc_server", "").empty())
options.col<Database::Address>() = value->get_inner();
if (field->get_tag("var") == "ports")