From 830a4c840e504a8c0be36de155b5069108af6842 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 19 Jul 2014 18:54:40 -0700
Subject: [PATCH] Checks if trakt is enabled before attempting to start
 schedualed thread tasks.

---
 sickbeard/__init__.py     | 3 +--
 sickbeard/properFinder.py | 3 ---
 sickbeard/subtitles.py    | 3 +--
 sickbeard/traktChecker.py | 3 +++
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 0693588f..914249ab 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -1158,8 +1158,7 @@ def start():
             autoPostProcesserScheduler.start()
 
             # start the subtitles finder
-            if USE_SUBTITLES:
-                subtitlesFinderScheduler.start()
+            subtitlesFinderScheduler.start()
 
             # start the trakt checker
             traktCheckerScheduler.start()
diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
index 68730cea..ef3fddf9 100644
--- a/sickbeard/properFinder.py
+++ b/sickbeard/properFinder.py
@@ -38,9 +38,6 @@ class ProperFinder():
     def __init__(self):
         self.amActive = False
 
-    def __del__(self):
-        pass
-
     def run(self, force=False):
 
         if not sickbeard.DOWNLOAD_PROPERS:
diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py
index 5547a690..eca0d982 100644
--- a/sickbeard/subtitles.py
+++ b/sickbeard/subtitles.py
@@ -87,10 +87,9 @@ class SubtitlesFinder():
     and download subtitles. Only if the defined rule is true
     """
     def run(self, force=False):
-        # TODO: Put that in the __init__ before starting the thread?
         if not sickbeard.USE_SUBTITLES:
-            logger.log(u'Subtitles support disabled', logger.DEBUG)
             return
+
         if len(sickbeard.subtitles.getEnabledServiceList()) < 1:
             logger.log(u'Not enough services selected. At least 1 service is required to search subtitles in the background', logger.ERROR)
             return
diff --git a/sickbeard/traktChecker.py b/sickbeard/traktChecker.py
index f5645f52..f08dc1ce 100644
--- a/sickbeard/traktChecker.py
+++ b/sickbeard/traktChecker.py
@@ -35,6 +35,9 @@ class TraktChecker():
         self.todoBacklog = []
 
     def run(self, force=False):
+        if not sickbeard.USE_TRAKT:
+            return
+
         try:
             # add shows from trakt.tv watchlist
             if sickbeard.TRAKT_USE_WATCHLIST: