diff --git a/gui/slick/interfaces/default/manage_manageSearches.tmpl b/gui/slick/interfaces/default/manage_manageSearches.tmpl index cc0420f0..2111fc69 100644 --- a/gui/slick/interfaces/default/manage_manageSearches.tmpl +++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl @@ -24,15 +24,6 @@ Not in progress
#if $backlogPaused then "Paused: " else ""# Currently running
#end if - -
-

Daily Episode Search:

- Force -#if not $searchStatus: -Not in progress
-#else: -In Progress
-#end if

Version Check:

diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py index d195d610..d306fad2 100644 --- a/sickbeard/search_queue.py +++ b/sickbeard/search_queue.py @@ -30,8 +30,6 @@ from sickbeard import generic_queue, scheduler from sickbeard import search, failed_history, history from sickbeard import ui from sickbeard.snatch_queue import SnatchQueue -from lib.concurrent.futures import as_completed -from lib.concurrent.futures.thread import ThreadPoolExecutor search_queue_lock = threading.Lock() @@ -72,10 +70,9 @@ class SearchQueue(generic_queue.GenericQueue): return self.min_priority >= generic_queue.QueuePriorities.NORMAL def is_backlog_in_progress(self): - for cur_item in self.queue.queue + [self.currentItem]: - with search_queue_lock: - if isinstance(cur_item, BacklogQueueItem): - return True + for cur_item in self.queue.queue: + if isinstance(cur_item, BacklogQueueItem): + return True return False def add_item(self, item):