Merge branch 'issue-2045' into develop

sickbeard/generic_queue.py

@@ -50,13 +50,14 @@ class GenericQueue(object):
         self.min_priority = 0
 
     def add_item(self, item):
+        with self.lock:
             item.added = datetime.datetime.now()
             self.queue.append(item)
 
             return item
 
     def run(self, force=False):
-
+        with self.lock:
             # only start a new task if one isn't already going
             if self.currentItem is None or not self.currentItem.isAlive():
 
@@ -92,6 +93,8 @@ class GenericQueue(object):
                     self.currentItem.name = self.queue_name + '-' + self.currentItem.name
                     self.currentItem.start()
 
+        self.amActive = False
+
 class QueueItem(threading.Thread):
     def __init__(self, name, action_id=0):
         super(QueueItem, self).__init__()