MacGui: more missing files.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7374 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m
index 33b82c315fcf6ad8a41ada2d66535b4187d2f3d7..fddd8a48d982c850fa2ae54c4779f7ab01c92bdf 100644 (file)
--- 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 c366ce14e4506f6e014a367c556a5c257be00949..b54143ff22df4630b83e22688e35954ae9c59913 100644 (file)
--- 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];
+        }
     }
 }