Changeset 2043

Timestamp:

10/23/07 22:02:15 (15 months ago)

Author:

markybob

Message:

hopefully fix segfault

Files:

• tags/deluge-0.5.5.95/src/interface.py (modified) (2 diffs)
• trunk/src/interface.py (modified) (2 diffs)

tags/deluge-0.5.5.95/src/interface.py

@@ -944 +944 @@
         #now we load blocklist plugin separately since it takes much longer
         enable_plugins = self.config.get('enabled_plugins').split(':')
-        if "Blocklist Importer" in enable_plugins:
-            try:
-                self.plugins.enable_plugin("Blocklist Importer")
-            except KeyError:
-                pass
-
-        try:
-            gobject.threads_init()
-            gtk.gdk.threads_enter()
-            gtk.main()
-            gtk.gdk.threads_leave()
-        except KeyboardInterrupt:
-            self.manager.quit()
-
         for torrent in self.manager.get_queue():
             unique_id = self.manager.get_torrent_unique_id(torrent)
@@ -966 +952 @@
                 if self.manager.unique_IDs[unique_id].uploaded_memory:
                     self.manager.unique_IDs[unique_id].initial_uploaded_memory \
-                    = self.manager.unique_IDs[unique_id].uploaded_memory
+                   = self.manager.unique_IDs[unique_id].uploaded_memory
             except AttributeError:
                 pass
+
+        if "Blocklist Importer" in enable_plugins:
+            try:
+                self.plugins.enable_plugin("Blocklist Importer")
+            except KeyError:
+                pass
+
+        try:
+            gobject.threads_init()
+            gtk.gdk.threads_enter()
+            gtk.main()
+            gtk.gdk.threads_leave()
+        except KeyboardInterrupt:
+            self.manager.quit()
 
     def load_plugins(self):

trunk/src/interface.py

@@ -944 +944 @@
         #now we load blocklist plugin separately since it takes much longer
         enable_plugins = self.config.get('enabled_plugins').split(':')
-        if "Blocklist Importer" in enable_plugins:
-            try:
-                self.plugins.enable_plugin("Blocklist Importer")
-            except KeyError:
-                pass
-
-        try:
-            gobject.threads_init()
-            gtk.gdk.threads_enter()
-            gtk.main()
-            gtk.gdk.threads_leave()
-        except KeyboardInterrupt:
-            self.manager.quit()
-
         for torrent in self.manager.get_queue():
             unique_id = self.manager.get_torrent_unique_id(torrent)
@@ -966 +952 @@
                 if self.manager.unique_IDs[unique_id].uploaded_memory:
                     self.manager.unique_IDs[unique_id].initial_uploaded_memory \
-                    = self.manager.unique_IDs[unique_id].uploaded_memory
+                   = self.manager.unique_IDs[unique_id].uploaded_memory
             except AttributeError:
                 pass
+
+        if "Blocklist Importer" in enable_plugins:
+            try:
+                self.plugins.enable_plugin("Blocklist Importer")
+            except KeyError:
+                pass
+
+        try:
+            gobject.threads_init()
+            gtk.gdk.threads_enter()
+            gtk.main()
+            gtk.gdk.threads_leave()
+        except KeyboardInterrupt:
+            self.manager.quit()
 
     def load_plugins(self):