Module: deluge
Branch: master
Commit: 37a00a48a7267d3448f85ca451e2f75f05c5ebff

Author: John Garland <[email protected]>
Date:   Fri Jul  2 02:36:04 2010 +1000

Fix uncaught exception when closing deluge in classic mode

---

 ChangeLog                     |   11 +++++++----
 deluge/ui/gtkui/mainwindow.py |    5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b546ec..4f48c9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,15 +8,18 @@
        * #1247: Fix deluge-gtk from hanging on shutdown
        * #995: Rewrote tracker_icons
 
-==== Blocklist ====
-       * Implement local blocklist support
-       * #861: Pause transfers until blocklist is imported
+==== GtkUI ====
+       * Fix uncaught exception when closing deluge in classic mode
 
-==== Web ====
+==== WebUI ====
        * Migrate to ExtJS 3.1
        * Add gzip compression of HTTP data to the server
        * Improve the efficiency of the TorrentGrid
 
+==== Blocklist ====
+       * Implement local blocklist support
+       * #861: Pause transfers until blocklist is imported
+
 === Deluge 1.2.0 - "Bursting like an infected kidney" (10 January 2010) ===
 ==== Core ====
        * Implement new RPC protocol DelugeRPC replacing XMLRPC
diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py
index 1153b1e..47887c1 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"]

-- 
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en.

Reply via email to