MacGUI: prevent a possible exception if a job being rescanned is manually deleted from the queue before the rescan is done.

1 files changed, 12 insertions, 5 deletions

diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index d972a1896..6c49a7621 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -356,15 +356,22 @@
 
     [self.delegate openJob:[item.job copy] completionHandler:^(BOOL result) {
         NSInteger index = [self.queue.items indexOfObject:item];
-        [self.queue resetItemsAtIndexes:[NSIndexSet indexSetWithIndex:index]];
-        if (result)
+        if (index != NSNotFound)
         {
-            // Now that source is loaded and settings applied, delete the queue item from the queue
-            [self.queue removeItemsAtIndexes:[NSIndexSet indexSetWithIndex:index]];
+            [self.queue resetItemsAtIndexes:[NSIndexSet indexSetWithIndex:index]];
+            if (result)
+            {
+                // Now that source is loaded and settings applied, delete the queue item from the queue
+                [self.queue removeItemsAtIndexes:[NSIndexSet indexSetWithIndex:index]];
+            }
+            else
+            {
+                NSBeep();
+            }
         }
         else
         {
-            NSBeep();
+            item.state = HBQueueItemStateReady;
         }
     }];
 }