summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Garland <johnnybg+deluge@gmail.com>2010-07-02 02:36:04 +1000
committerJohn Garland <johnnybg+deluge@gmail.com>2010-07-02 02:43:07 +1000
commitd9a2c4db720544a290fbb9655a51e9a687b0fe5f (patch)
tree4ad70931a7eb8bc5ab5f870a6f38353c27a40279
parent8fb7277a8283c609b366952a7e55c05488865c22 (diff)
downloaddeluge-d9a2c4db720544a290fbb9655a51e9a687b0fe5f.tar.gz
deluge-d9a2c4db720544a290fbb9655a51e9a687b0fe5f.tar.bz2
deluge-d9a2c4db720544a290fbb9655a51e9a687b0fe5f.zip
Fix uncaught exception when closing deluge in classic mode
-rw-r--r--ChangeLog3
-rw-r--r--deluge/ui/gtkui/mainwindow.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21f97af04..c96aaf21f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
* #1307: Fix not being able to add torrents
* #1293: Fix not being able to add paths that contain backslashes
+==== GtkUI ====
+ * Fix uncaught exception when closing deluge in classic mode
+
==== Execute ====
* #1306: Fix always executing last event
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 1153b1e26..47887c155 100644
--- a/deluge/ui/gtkui/mainwindow.py
+++ b/deluge/ui/gtkui/mainwindow.py
@@ -153,7 +153,10 @@ class MainWindow(component.Component):
return self.main_glade
def quit(self):
- reactor.stop()
+ if client.is_classicmode():
+ gtk.main_quit()
+ else:
+ reactor.stop()
def load_window_state(self):
x = self.config["window_x_pos"]