From eeac8efcf24d7e0914f7f30b7df2991869642fa7 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Mon, 14 Dec 2009 00:48:18 +0000 Subject: [PATCH] Fix issue where stoping a daemon that you aren't connected to causes the gtkui to shutdown the currently connected daemon. --- ChangeLog | 2 ++ deluge/ui/gtkui/connectionmanager.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d4e46bed4..780db7cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ * Fix #1036 autoconnecting to localhost daemon on start-up * Fix issue where hosts will show up erroneously as Offline * Add #891 remove torrents by pressing the Delete key + * Fix issue where stoping a daemon that you aren't connected to causes the + gtkui to shutdown the currently connected daemon. ==== Console ==== * Fix using the console in Windows, but only in command-line mode diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index 24108b895..fa963fdac 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -526,7 +526,7 @@ class ConnectionManager(component.Component): def on_daemon_shutdown(d): # Update display to show change self.__update_list() - if client.connected(): + if client.connected() and client.connection_info() == (host, port, user): client.daemon.shutdown().addCallback(on_daemon_shutdown) else: # Create a new client instance