Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue where stoping a daemon that you aren't connected to causes the gtkui to shutdown the

Browse Source 
currently connected daemon.
This commit is contained in:
Andrew Resch 2009-12-14 00:48:18 +00:00
parent f59901c1be
commit eeac8efcf2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -26,6 +26,8 @@
* Fix #1036 autoconnecting to localhost daemon on start-up * Fix #1036 autoconnecting to localhost daemon on start-up
* Fix issue where hosts will show up erroneously as Offline * Fix issue where hosts will show up erroneously as Offline
* Add #891 remove torrents by pressing the Delete key * 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 ==== ==== Console ====
* Fix using the console in Windows, but only in command-line mode * Fix using the console in Windows, but only in command-line mode

2
deluge/ui/gtkui/connectionmanager.py
View File

@ -526,7 +526,7 @@ class ConnectionManager(component.Component):
def on_daemon_shutdown(d): def on_daemon_shutdown(d):
# Update display to show change # Update display to show change
self.__update_list() self.__update_list()
if client.connected(): if client.connected() and client.connection_info() == (host, port, user):
client.daemon.shutdown().addCallback(on_daemon_shutdown) client.daemon.shutdown().addCallback(on_daemon_shutdown)
else: else:
# Create a new client instance # Create a new client instance