summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-12-12 22:38:26 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-12-12 22:38:26 +0000
commit139d6538a20f42d1129f6dad5b965f41f49ecf7b (patch)
tree0e1b65a122b65c8f6a27beed489854cd45e760af
parentb88319b4be035b38ef21f5062024fcc7848511ce (diff)
downloaddeluge-139d6538a20f42d1129f6dad5b965f41f49ecf7b.tar.gz
deluge-139d6538a20f42d1129f6dad5b965f41f49ecf7b.tar.bz2
deluge-139d6538a20f42d1129f6dad5b965f41f49ecf7b.zip
Fix #782 do not ask for tray password when window is not minimized to tray
-rw-r--r--ChangeLog1
-rw-r--r--deluge/ui/gtkui/systemtray.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a4c09c072..33750c1e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
* Fix uploading plugins when the daemon is not localhost
* Fix #692 no longer require tray password when quitting from the tray icon
while the window is visible.
+ * Fix #782 do not ask for tray password when window is not minimized to tray
==== Console ====
* Fix using the console in Windows, but only in command-line mode
diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 6b1ca8593..4c0be9564 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -274,7 +274,7 @@ class SystemTray(component.Component):
"""Called when the tray icon is left clicked."""
self.blink(False)
- if self.window.active():
+ if self.window.active() or self.window.visible():
self.window.hide()
else:
if self.config["lock_tray"]: