Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
visible.
This commit is contained in:
Andrew Resch 2009-12-12 21:22:51 +00:00
parent dd129f8544
commit b88319b4be
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -20,6 +20,8 @@
* Fix crash in Windows when creating a torrent * Fix crash in Windows when creating a torrent
* Add button to Other preferences to associate magnet links with Deluge * Add button to Other preferences to associate magnet links with Deluge
* Fix uploading plugins when the daemon is not localhost * 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 ==== ==== Console ====
* Fix using the console in Windows, but only in command-line mode * Fix using the console in Windows, but only in command-line mode

4
deluge/ui/gtkui/systemtray.py
View File

@ -321,7 +321,7 @@ class SystemTray(component.Component):
def on_menuitem_quit_activate(self, menuitem): def on_menuitem_quit_activate(self, menuitem):
log.debug("on_menuitem_quit_activate") 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(): if not self.unlock_tray():
return return
@ -332,7 +332,7 @@ class SystemTray(component.Component):
def on_menuitem_quitdaemon_activate(self, menuitem): def on_menuitem_quitdaemon_activate(self, menuitem):
log.debug("on_menuitem_quitdaemon_activate") 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(): if not self.unlock_tray():
return return