From 7d3c1ed92733a05ab4282993ffe58fb88a1b50e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 23 May 2018 01:09:19 +0200
Subject: Do not use (or present to the user) the Address field in fixed mode

fix #3359
---
 src/irc/irc_client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/irc')

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 " +
-- 
cgit v1.2.3