codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTKUI: Simplify the quit code for mainwindow

This commit is contained in:
Calum Lind 2013-05-19 01:51:55 +01:00
parent 35c85c6d1d
commit 86ac98b9f9
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deluge/ui/gtkui/mainwindow.py
View File

@ -223,24 +223,18 @@ class MainWindow(component.Component):
:param shutdown: whether or not to shutdown the daemon as well :param shutdown: whether or not to shutdown the daemon as well
:type shutdown: boolean :type shutdown: boolean
""" """
if shutdown: def stop_gtk_reactor(result=None):
def on_daemon_shutdown(result):
try: try:
reactor.stop() reactor.stop()
except ReactorNotRunning: except ReactorNotRunning:
log.debug("Attempted to stop the reactor but it is not running...") log.debug("Attempted to stop the reactor but it is not running...")
client.daemon.shutdown().addCallback(on_daemon_shutdown)
return
if client.is_classicmode():
reactor.stop()
return
if not client.connected():
reactor.stop()
return
def on_client_disconnected(result):
reactor.stop()
client.disconnect().addCallback(on_client_disconnected)
if shutdown:
client.daemon.shutdown().addCallback(stop_gtk_reactor)
elif not client.is_classicmode() and client.connected():
client.disconnect().addCallback(stop_gtk_reactor)
else:
stop_gtk_reactor()
def load_window_state(self): def load_window_state(self):
x = self.config["window_x_pos"] x = self.config["window_x_pos"]