Changeset 3272

Timestamp:

06/23/08 06:47:06 (7 months ago)

Author:

andar

Message:

Properly shutdown the daemon if changing from classic to regular

Location:

branches/deluge-0.6/deluge/ui/gtkui

Files:

• gtkui.py (modified) (2 diffs)
• menubar.py (modified) (2 diffs)

branches/deluge-0.6/deluge/ui/gtkui/gtkui.py

@@ -133 +133 @@
         self.config = deluge.configmanager.ConfigManager("gtkui.conf", DEFAULT_PREFS)
 
+        # We need to check on exit if it was started in classic mode to ensure we
+        # shutdown the daemon.
+        self.started_in_classic = self.config["classic_mode"]
+        
         # Start the Dbus Interface before anything else.. Just in case we are
         # already running.
@@ -185 +189 @@
         # Shutdown all components
         component.shutdown()
+        if self.started_in_classic:
+            client.shutdown()
 
     def _on_new_core(self, data):

branches/deluge-0.6/deluge/ui/gtkui/menubar.py

@@ -37 +37 @@
 import pkg_resources
 
+import deluge.error
 import deluge.component as component
 from deluge.ui.client import aclient as client
@@ -223 +224 @@
         log.debug("on_menuitem_quit_activate")
         if self.config["classic_mode"]:
-            client.shutdown()
+            try:
+                client.shutdown()
+            except deluge.error.NoCoreError:
+                pass
         self.window.quit()