Fix previous merge

1 files changed, 6 insertions, 3 deletions

diff --git a/pyload/plugins/addon/ClickAndLoad.py b/pyload/plugins/addon/ClickAndLoad.py
index cad6e5c13..1f55b15dd 100644
--- a/pyload/plugins/addon/ClickAndLoad.py
+++ b/pyload/plugins/addon/ClickAndLoad.py
@@ -33,10 +33,14 @@ class ClickAndLoad(Addon):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    def coreReady(self):
+    def setup(self):
         self.interval = 300
 
 
+    def coreReady(self):
+        self.initPeriodical()
+
+
     def periodical(self):
         webip   = "0.0.0.0" if self.getConfig("extern") else "127.0.0.1"
         webport = self.config['webinterface']['port']
@@ -64,8 +68,7 @@ class ClickAndLoad(Addon):
                 self.logDebug(e)
 
         else:
+            self.core.scheduler.removeJob(self.cb)
             t = Thread(target=forward, args=[client, server])
             t.setDaemon(True)
             t.start()
-            self.interval = -1
-