diff options
author | Andrew Resch <andrewresch@gmail.com> | 2009-12-12 21:22:51 +0000 |
---|---|---|
committer | Andrew Resch <andrewresch@gmail.com> | 2009-12-12 21:22:51 +0000 |
commit | b88319b4be035b38ef21f5062024fcc7848511ce (patch) | |
tree | edff27ae22cd2f5e6c883fece81d2bc5498e120f | |
parent | dd129f85445561307b9ad65ae3541d768cb3d77e (diff) | |
download | deluge-b88319b4be035b38ef21f5062024fcc7848511ce.tar.gz deluge-b88319b4be035b38ef21f5062024fcc7848511ce.tar.bz2 deluge-b88319b4be035b38ef21f5062024fcc7848511ce.zip |
Fix #692 no longer require tray password when quitting from the tray icon while the window is
visible.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | deluge/ui/gtkui/systemtray.py | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -20,6 +20,8 @@ * Fix crash in Windows when creating a torrent * Add button to Other preferences to associate magnet links with Deluge * 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. ==== 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 ee1f25fd2..6b1ca8593 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -321,7 +321,7 @@ class SystemTray(component.Component): def on_menuitem_quit_activate(self, menuitem): log.debug("on_menuitem_quit_activate") - if self.config["lock_tray"]: + if self.config["lock_tray"] and not self.window.visible(): if not self.unlock_tray(): return @@ -332,7 +332,7 @@ class SystemTray(component.Component): def on_menuitem_quitdaemon_activate(self, menuitem): log.debug("on_menuitem_quitdaemon_activate") - if self.config["lock_tray"]: + if self.config["lock_tray"] and not self.window.visible(): if not self.unlock_tray(): return |