diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBAppDelegate.m | 2 | ||||
| -rw-r--r-- | macosx/HBQueueController.m | 29 |
2 files changed, 18 insertions, 13 deletions
diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m index 33b82c315..fddd8a48d 100644 --- a/macosx/HBAppDelegate.m +++ b/macosx/HBAppDelegate.m @@ -180,7 +180,7 @@ - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { - [self.mainController openFile:[NSURL fileURLWithPath:filenames.firstObject]]; + [self.mainController openURL:[NSURL fileURLWithPath:filenames.firstObject]]; [NSApp replyToOpenOrPrint:NSApplicationDelegateReplySuccess]; } diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index c366ce14e..b54143ff2 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -1021,15 +1021,16 @@ { // since we are not a currently encoding item, we can just be edit it HBJob *item = [[self.jobs[row] representedObject] copy]; - [self.controller openJob:item]; - - // Now that source is loaded and settings applied, delete the queue item from the queue - [self.outlineView beginUpdates]; - [self removeQueueItemAtIndex:row]; - [self.outlineView removeItemsAtIndexes:[NSIndexSet indexSetWithIndex:row] inParent:nil withAnimation:NSTableViewAnimationEffectFade]; - [self.outlineView endUpdates]; + if ([self.controller openJob:item]) + { + // Now that source is loaded and settings applied, delete the queue item from the queue + [self.outlineView beginUpdates]; + [self removeQueueItemAtIndex:row]; + [self.outlineView removeItemsAtIndexes:[NSIndexSet indexSetWithIndex:row] inParent:nil withAnimation:NSTableViewAnimationEffectFade]; + [self.outlineView endUpdates]; - [self getQueueStats]; + [self getQueueStats]; + } } } @@ -1050,10 +1051,14 @@ [self cancelCurrentJobAndContinue]; } - [self.jobs beginTransaction]; - [self.controller openJob:job]; - [self removeQueueItemAtIndex:index]; - [self.jobs commit]; + if ([self.controller openJob:job]) + { + [self.jobs beginTransaction]; + [self.controller openJob:job]; + [self removeQueueItemAtIndex:index]; + [self.jobs commit]; + [self getQueueStats]; + } } } |