From c2ebc7b5e4738bf27363e5730b11fe071f0e909e Mon Sep 17 00:00:00 2001
From: jesopo
Date: Mon, 5 Nov 2018 11:53:33 +0000
Subject: Refactor IRCServer .connect() logic

---
 src/IRCBot.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/IRCBot.py')

diff --git a/src/IRCBot.py b/src/IRCBot.py
index e67dc0ee..f7e0dfe9 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -43,11 +43,13 @@ class Bot(object):
         new_server = IRCServer.Server(self, self._events, server_id, alias,
             hostname, port, password, ipv4, tls, bindhost, nickname, username,
             realname)
-        if not new_server.get_setting("connect", True):
-            return new_server
         self._events.on("new.server").call(server=new_server)
-        if connect and new_server.get_setting("connect", True):
-            self.connect(new_server)
+
+        if not connect or not new_server.get_setting("connect", True):
+            return new_server
+
+        self.connect(new_server)
+
         return new_server
 
     def add_socket(self, sock: socket.socket):
-- 
cgit v1.3.1-10-gc9f91