From ee442536a85af6cb986fd24c8cb1e03bf038b061 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Fri, 31 Jul 2009 00:39:09 +0000 Subject: [PATCH] Fix properly disconnecting from the currently connected daemon when connecting to a different daemon --- deluge/ui/gtkui/connectionmanager.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 7e95b46d6..ab29f4574 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -414,7 +414,14 @@ class ConnectionManager(component.Component): user = model[row][HOSTLIST_COL_USER] password = model[row][HOSTLIST_COL_PASS] - client.connect(host, port, user, password).addCallback(self.__on_connected, host_id) + def do_connect(*args): + client.connect(host, port, user, password).addCallback(self.__on_connected, host_id) + + if client.connected(): + client.disconnect().addCallback(do_connect) + else: + do_connect() + self.connection_manager.response(gtk.RESPONSE_OK) def on_button_close_clicked(self, widget):