diff options
author | Andrew Resch <andrewresch@gmail.com> | 2009-12-14 00:48:18 +0000 |
---|---|---|
committer | Andrew Resch <andrewresch@gmail.com> | 2009-12-14 00:48:18 +0000 |
commit | eeac8efcf24d7e0914f7f30b7df2991869642fa7 (patch) | |
tree | 9d2e3ab5af8d732324d2359646cf74cf0c879cdb | |
parent | f59901c1beb9a767a9b7dcae00235489f8e7b065 (diff) | |
download | deluge-eeac8efcf24d7e0914f7f30b7df2991869642fa7.tar.gz deluge-eeac8efcf24d7e0914f7f30b7df2991869642fa7.tar.bz2 deluge-eeac8efcf24d7e0914f7f30b7df2991869642fa7.zip |
Fix issue where stoping a daemon that you aren't connected to causes the gtkui to shutdown the
currently connected daemon.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | deluge/ui/gtkui/connectionmanager.py | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |