From 466eba7fa08a10510fe9bcf301c48fc43d755015 Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 8 May 2014 11:16:45 -0700 Subject: [PATCH] Fixed issue #472 --- sickbeard/__init__.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 59ec2cd0..7cf04885 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -79,7 +79,6 @@ showUpdateScheduler = None versionCheckScheduler = None showQueueScheduler = None searchQueueScheduler = None -snatchQueueScheduler = None properFinderScheduler = None autoPostProcesserScheduler = None subtitlesFinderScheduler = None @@ -496,7 +495,7 @@ def initialize(consoleLogging=True): USE_PUSHBULLET, PUSHBULLET_NOTIFY_ONSNATCH, PUSHBULLET_NOTIFY_ONDOWNLOAD, PUSHBULLET_NOTIFY_ONSUBTITLEDOWNLOAD, PUSHBULLET_API, PUSHBULLET_DEVICE, \ versionCheckScheduler, VERSION_NOTIFY, AUTO_UPDATE, PROCESS_AUTOMATICALLY, UNPACK, \ KEEP_PROCESSED_DIR, PROCESS_METHOD, TV_DOWNLOAD_DIR, MIN_SEARCH_FREQUENCY, DEFAULT_UPDATE_FREQUENCY,MIN_UPDATE_FREQUENCY,UPDATE_FREQUENCY,\ - showQueueScheduler, searchQueueScheduler, snatchQueueScheduler, ROOT_DIRS, CACHE_DIR, ACTUAL_CACHE_DIR, \ + showQueueScheduler, searchQueueScheduler, ROOT_DIRS, CACHE_DIR, ACTUAL_CACHE_DIR, \ NAMING_PATTERN, NAMING_MULTI_EP, NAMING_FORCE_FOLDERS, NAMING_ABD_PATTERN, NAMING_CUSTOM_ABD, NAMING_SPORTS_PATTERN, NAMING_CUSTOM_SPORTS, NAMING_STRIP_YEAR, \ RENAME_EPISODES, properFinderScheduler, PROVIDER_ORDER, autoPostProcesserScheduler, \ WOMBLE, OMGWTFNZBS, OMGWTFNZBS_USERNAME, OMGWTFNZBS_APIKEY, providerList, newznabProviderList, torrentRssProviderList, \ @@ -1140,7 +1139,7 @@ def start(): def halt(): global __INITIALIZED__, currentSearchScheduler, backlogSearchScheduler, showUpdateScheduler, \ showQueueScheduler, properFinderScheduler, autoPostProcesserScheduler, searchQueueScheduler, \ - subtitlesFinderScheduler, snatchQueueScheduler, started, \ + subtitlesFinderScheduler, started, \ traktWatchListCheckerSchedular with INIT_LOCK: @@ -1193,13 +1192,6 @@ def halt(): except: pass - snatchQueueScheduler.abort = True - logger.log(u"Waiting for the SNATCHQUEUE thread to exit") - try: - snatchQueueScheduler.thread.join(10) - except: - pass - autoPostProcesserScheduler.abort = True logger.log(u"Waiting for the POSTPROCESSER thread to exit") try: