summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-05-23 01:17:36 +0200
committerlouiz’ <louiz@louiz.org>2018-05-23 01:17:36 +0200
commit68d86a9daa0a3b407ec1c98715e927e5b7e79eb9 (patch)
tree4545ffad8346200979753e1266e6ef0827ceca32 /src/irc
parentad1c63b129a928894e7255dc1eb5349d994fa1d1 (diff)
parentd3eda68761d6b5f4394c41248ae95915d6e90ae2 (diff)
downloadbiboumi-68d86a9daa0a3b407ec1c98715e927e5b7e79eb9.tar.gz
biboumi-68d86a9daa0a3b407ec1c98715e927e5b7e79eb9.tar.bz2
biboumi-68d86a9daa0a3b407ec1c98715e927e5b7e79eb9.tar.xz
biboumi-68d86a9daa0a3b407ec1c98715e927e5b7e79eb9.zip
Merge branch 'v8'
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/irc_client.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index d0b2153..d7fa2cd 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -195,7 +195,8 @@ void IrcClient::start()
# ifdef BOTAN_FOUND
this->credential_manager.set_trusted_fingerprint(options.col<Database::TrustedFingerprint>());
# endif
- if (!options.col<Database::Address>().empty())
+ if (Config::get("fixed_irc_server", "").empty() &&
+ !options.col<Database::Address>().empty())
address = options.col<Database::Address>();
#endif
this->bridge.send_xmpp_message(this->hostname, "", "Connecting to " +