From 7e0d09a7bc2009ba929ff8fc54c9e901f8d18ad8 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. --- deluge/ui/gtkui/systemtray.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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