Module: deluge
Branch: 1.3-stable
Commit: 010b6dd4af9de1113a3e189a1b8a57aa454fae67

Author: Andrew Resch <[email protected]>
Date:   Sat Jun 18 20:13:58 2011 -0700

Fix preferencesmanager from failing to stop when trying to stop
loopingcall that wasn't started

---

 deluge/core/preferencesmanager.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deluge/core/preferencesmanager.py 
b/deluge/core/preferencesmanager.py
index cf739c7..40070bb 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -228,7 +228,7 @@ class PreferencesManager(component.Component):
         self.config.register_change_callback(self._on_config_value_change)
 
     def stop(self):
-        if self.new_release_timer:
+        if self.new_release_timer and self.new_release_timer.running:
             self.new_release_timer.stop()
 
     # Config set functions
@@ -456,14 +456,14 @@ class PreferencesManager(component.Component):
         if value:
             log.debug("Checking for new release..")
             threading.Thread(target=self.core.get_new_release).start()
-            if self.new_release_timer:
+            if self.new_release_timer and self.new_release_timer.running:
                 self.new_release_timer.stop()
             # Set a timer to check for a new release every 3 days
             self.new_release_timer = LoopingCall(
                 self._on_new_release_check, "new_release_check", True)
             self.new_release_timer.start(72 * 60 * 60, False)
         else:
-            if self.new_release_timer:
+            if self.new_release_timer and self.new_release_timer.running:
                 self.new_release_timer.stop()
 
     def _on_set_proxies(self, key, value):

-- 
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