From b88319b4be035b38ef21f5062024fcc7848511ce Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Sat, 12 Dec 2009 21:22:51 +0000 Subject: [PATCH] Fix #692 no longer require tray password when quitting from the tray icon while the window is visible. --- ChangeLog | 2 ++ deluge/ui/gtkui/systemtray.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c868a9c15..a4c09c072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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