Don't start when not set to +Unpack and abort if Category changed

sabnzbd/directunpacker.py

@@ -82,7 +82,7 @@ class DirectUnpacker(threading.Thread):
             pass
 
     def check_requirements(self):
-        if self.killed or cfg.direct_unpack() < 1 or sabnzbd.newsunpack.RAR_PROBLEM:
+        if self.killed or not self.nzo.unpack or cfg.direct_unpack() < 1 or sabnzbd.newsunpack.RAR_PROBLEM:
             return False
         return True
 

sabnzbd/nzbqueue.py

@@ -322,6 +322,8 @@ class NzbQueue(object):
                 nzo.set_pp(pp)
                 if explicit_priority is None:
                     self.set_priority(nzo_id, prio)
+                # Abort any ongoing unpacking if the category changed
+                nzo.abort_direct_unpacker()
                 result += 1
         return result
 

sabnzbd/nzbstuff.py

@@ -1133,6 +1133,9 @@ class NzbObject(TryList):
     def set_pp(self, value):
         self.repair, self.unpack, self.delete = sabnzbd.pp_to_opts(value)
         logging.info('Set pp=%s for job %s', value, self.final_name)
+        # Abort unpacking if not desired anymore
+        if not self.unpack:
+            self.abort_direct_unpacker()
         self.save_to_disk()
 
     @property