From 85767b148abc34eccf5cdcf8de4a57e432bf7940 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Sun, 7 Oct 2007 03:33:36 +0000 Subject: [PATCH] fix tray locking pop-up on quit while disabled --- deluge/ui/gtkui/systemtray.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py index 3b1bd64d5..2f270e495 100644 --- a/deluge/ui/gtkui/systemtray.py +++ b/deluge/ui/gtkui/systemtray.py @@ -176,7 +176,10 @@ class SystemTray: if self.window.visible(): self.window.quit() else: - self.unlock_tray("quitui") + if self.config["lock_tray"] == True: + self.unlock_tray("quitui") + else: + self.window.quit() def on_menuitem_quitdaemon_activate(self, menuitem): log.debug("on_menuitem_quitdaemon_activate") @@ -184,7 +187,11 @@ class SystemTray: self.window.quit() functions.shutdown() else: - self.unlock_tray("quitdaemon") + if self.config["lock_tray"] == True: + self.unlock_tray("quitdaemon") + else: + self.window.quit() + functions.shutdown() def build_menu_radio_list(self, value_list, callback, pref_value=None, suffix=None, show_notset=False, notset_label=None, notset_lessthan=0,