Fix #692 no longer require tray password when quitting from the tray icon while the window is

visible.
This commit is contained in:
Andrew Resch 2009-12-12 21:22:51 +00:00
parent 42e904b63c
commit 7e0d09a7bc

View File

@ -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