Do not t...
Content-type: text/plain
Author: andar
Revision: 5833
Log:
Fix saving torrent state on fresh configs
Do not try to call doIteration() on the reactor if it has already stopped
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-10-10 14:06:08 UTC (rev 5832)
+++ branches/1.2_RC/ChangeLog 2009-10-11 18:46:35 UTC (rev 5833)
@@ -2,7 +2,11 @@
==== GtkUI ====
* Fix path errors when adding torrents externally in Windows
* Fix localclient authentication by stripping the lines read from the auth
file
+ * Do not try to call doIteration() on the reactor if it has already stopped
+==== Core ====
+ * Fix saving torrent state on fresh configs
+
==== Misc ====
* Add man pages for deluge-console and deluge-gtk
Modified: branches/1.2_RC/deluge/core/torrentmanager.py
===================================================================
--- branches/1.2_RC/deluge/core/torrentmanager.py 2009-10-10 14:06:08 UTC
(rev 5832)
+++ branches/1.2_RC/deluge/core/torrentmanager.py 2009-10-11 18:46:35 UTC
(rev 5833)
@@ -132,6 +132,10 @@
# Get the core config
self.config = ConfigManager("core.conf")
+ # Make sure the state folder has been created
+ if not os.path.exists(os.path.join(get_config_dir(), "state")):
+ os.makedirs(os.path.join(get_config_dir(), "state"))
+
# Create the torrents dict { torrent_id: Torrent }
self.torrents = {}
Modified: branches/1.2_RC/deluge/ui/gtkui/gtkui.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/gtkui.py 2009-10-10 14:06:08 UTC (rev
5832)
+++ branches/1.2_RC/deluge/ui/gtkui/gtkui.py 2009-10-11 18:46:35 UTC (rev
5833)
@@ -233,7 +233,7 @@
# Process any pending gtk events since the mainloop has been quit
if not deluge.common.windows_check():
- while gtk.events_pending():
+ while gtk.events_pending() and reactor.running:
reactor.doIteration(0)
# Shutdown all components
Modified: trunk/deluge/core/torrentmanager.py
===================================================================
--- trunk/deluge/core/torrentmanager.py 2009-10-10 14:06:08 UTC (rev 5832)
+++ trunk/deluge/core/torrentmanager.py 2009-10-11 18:46:35 UTC (rev 5833)
@@ -132,6 +132,10 @@
# Get the core config
self.config = ConfigManager("core.conf")
+ # Make sure the state folder has been created
+ if not os.path.exists(os.path.join(get_config_dir(), "state")):
+ os.makedirs(os.path.join(get_config_dir(), "state"))
+
# Create the torrents dict { torrent_id: Torrent }
self.torrents = {}
Modified: trunk/deluge/ui/gtkui/gtkui.py
===================================================================
--- trunk/deluge/ui/gtkui/gtkui.py 2009-10-10 14:06:08 UTC (rev 5832)
+++ trunk/deluge/ui/gtkui/gtkui.py 2009-10-11 18:46:35 UTC (rev 5833)
@@ -233,7 +233,7 @@
# Process any pending gtk events since the mainloop has been quit
if not deluge.common.windows_check():
- while gtk.events_pending():
+ while gtk.events_pending() and reactor.running:
reactor.doIteration(0)
# Shutdown all components
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
