Author: andar
Revision: 6024
Log:
Fix issue where stoping a daemon that you aren't connected to causes
the gtkui to shutdown the
currently connected daemon.
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-12-13 22:47:15 UTC (rev 6023)
+++ branches/1.2_RC/ChangeLog 2009-12-14 00:48:18 UTC (rev 6024)
@@ -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
Modified: branches/1.2_RC/deluge/ui/gtkui/connectionmanager.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/connectionmanager.py 2009-12-13
22:47:15 UTC (rev 6023)
+++ branches/1.2_RC/deluge/ui/gtkui/connectionmanager.py 2009-12-14
00:48:18 UTC (rev 6024)
@@ -526,7 +526,7 @@
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
Modified: trunk/deluge/ui/gtkui/connectionmanager.py
===================================================================
--- trunk/deluge/ui/gtkui/connectionmanager.py 2009-12-13 22:47:15 UTC (rev
6023)
+++ trunk/deluge/ui/gtkui/connectionmanager.py 2009-12-14 00:48:18 UTC (rev
6024)
@@ -526,7 +526,7 @@
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
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
