From 1b84c6d28102dd525168a893ee5ac977539987be Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 19 Jul 2014 15:32:28 -0700
Subject: [PATCH] Fix for subtitle processing.

---
 sickbeard/__init__.py | 20 ++++++++++----------
 sickbeard/webserve.py |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index d5e9fe7c..0693588f 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -1190,70 +1190,70 @@ def halt():
             dailySearchScheduler.stop.set()
             logger.log(u"Waiting for the DAILYSEARCH thread to exit")
             try:
-                dailySearchScheduler.thread.join()
+                dailySearchScheduler.join()
             except:
                 pass
 
             backlogSearchScheduler.stop.set()
             logger.log(u"Waiting for the BACKLOG thread to exit")
             try:
-                backlogSearchScheduler.thread.join()
+                backlogSearchScheduler.join()
             except:
                 pass
 
             showUpdateScheduler.stop.set()
             logger.log(u"Waiting for the SHOWUPDATER thread to exit")
             try:
-                showUpdateScheduler.thread.join()
+                showUpdateScheduler.join()
             except:
                 pass
 
             versionCheckScheduler.stop.set()
             logger.log(u"Waiting for the VERSIONCHECKER thread to exit")
             try:
-                versionCheckScheduler.thread.join()
+                versionCheckScheduler.join()
             except:
                 pass
 
             showQueueScheduler.stop.set()
             logger.log(u"Waiting for the SHOWQUEUE thread to exit")
             try:
-                showQueueScheduler.thread.join()
+                showQueueScheduler.join()
             except:
                 pass
 
             searchQueueScheduler.stop.set()
             logger.log(u"Waiting for the SEARCHQUEUE thread to exit")
             try:
-                searchQueueScheduler.thread.join()
+                searchQueueScheduler.join()
             except:
                 pass
 
             autoPostProcesserScheduler.stop.set()
             logger.log(u"Waiting for the POSTPROCESSER thread to exit")
             try:
-                autoPostProcesserScheduler.thread.join()
+                autoPostProcesserScheduler.join()
             except:
                 pass
 
             traktCheckerScheduler.stop.set()
             logger.log(u"Waiting for the TRAKTCHECKER thread to exit")
             try:
-                traktCheckerScheduler.thread.join()
+                traktCheckerScheduler.join()
             except:
                 pass
 
             properFinderScheduler.stop.set()
             logger.log(u"Waiting for the PROPERFINDER thread to exit")
             try:
-                properFinderScheduler.thread.join()
+                properFinderScheduler.join()
             except:
                 pass
 
             subtitlesFinderScheduler.stop.set()
             logger.log(u"Waiting for the SUBTITLESFINDER thread to exit")
             try:
-                subtitlesFinderScheduler.thread.join()
+                subtitlesFinderScheduler.join()
             except:
                 pass
 
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index c9238286..270252ab 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -2399,15 +2399,15 @@ class ConfigSubtitles(MainHandler):
             subtitles_finder_frequency = 1
 
         if use_subtitles == "on":
-            if sickbeard.subtitlesFinderScheduler.thread is None or not sickbeard.subtitlesFinderScheduler.thread.isAlive():
+            if not sickbeard.subtitlesFinderScheduler.isAlive():
                 sickbeard.subtitlesFinderScheduler.silent = False
-                sickbeard.subtitlesFinderScheduler.initThread()
+                sickbeard.subtitlesFinderScheduler.start()
         else:
-            sickbeard.subtitlesFinderScheduler.abort = True
+            sickbeard.subtitlesFinderScheduler.stop.set()
             sickbeard.subtitlesFinderScheduler.silent = True
             logger.log(u"Waiting for the SUBTITLESFINDER thread to exit")
             try:
-                sickbeard.subtitlesFinderScheduler.thread.join(5)
+                sickbeard.subtitlesFinderScheduler.join()
             except:
                 pass