From 72fd3bd061a968b354896e323136435a7f5feeb1 Mon Sep 17 00:00:00 2001 From: John Garland Date: Sun, 2 May 2010 22:23:49 +1000 Subject: [PATCH] Fix deluge-gtk hanging on shutdown (thanks Jan Steffens) --- deluge/ui/gtkui/gtkui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 255622afb..48569863f 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -167,7 +167,7 @@ class GtkUI(object): self.gnome_prog = gnome.init("Deluge", deluge.common.get_version()) self.gnome_client = gnome.ui.master_client() def on_die(*args): - gtk.main_quit() + reactor.stop() self.gnome_client.connect("die", on_die) log.debug("GNOME session 'die' handler registered!") except Exception, e: @@ -180,7 +180,7 @@ class GtkUI(object): def win_handler(ctrl_type): log.debug("ctrl_type: %s", ctrl_type) if ctrl_type in (CTRL_CLOSE_EVENT, CTRL_SHUTDOWN_EVENT): - gtk.main_quit() + reactor.stop() return 1 SetConsoleCtrlHandler(win_handler)