Revision: 5922
Log:
Only try to stop LoopingCalls if they are running
Diff:
Modified: branches/1.2_RC/deluge/core/torrentmanager.py
===================================================================
--- branches/1.2_RC/deluge/core/torrentmanager.py 2009-11-05 03:44:46 UTC (rev 5921)
+++ branches/1.2_RC/deluge/core/torrentmanager.py 2009-11-05 04:35:17 UTC (rev 5922)
@@ -210,9 +210,12 @@
def stop(self):
# Stop timers
- self.save_state_timer.stop()
- self.save_resume_data_timer.stop()
+ if self.save_state_timer.running:
+ self.save_state_timer.stop()
+ if self.save_resume_data_timer.running:
+ self.save_resume_data_timer.stop()
+
# Save state on shutdown
self.save_state()
Modified: trunk/deluge/core/torrentmanager.py
===================================================================
--- trunk/deluge/core/torrentmanager.py 2009-11-05 03:44:46 UTC (rev 5921)
+++ trunk/deluge/core/torrentmanager.py 2009-11-05 04:35:17 UTC (rev 5922)
@@ -210,9 +210,12 @@
def stop(self):
# Stop timers
- self.save_state_timer.stop()
- self.save_resume_data_timer.stop()
+ if self.save_state_timer.running:
+ self.save_state_timer.stop()
+ if self.save_resume_data_timer.running:
+ self.save_resume_data_timer.stop()
+
# Save state on shutdown
self.save_state()