MacGui: do not let an instance edit a job that another instance is currently encoding. Fix the "Stop encoding" menu item key equivalent.

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

1 files changed, 1 insertions, 3 deletions

diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index e97f7162c..d43c43d70 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -113,14 +113,12 @@
         if (self.core.state == HBStateIdle)
         {
             menuItem.title = NSLocalizedString(@"Start Encoding", nil);
-            menuItem.keyEquivalent = @"s";
 
             return (self.pendingItemsCount > 0);
         }
         else if (self.core.state != HBStateIdle)
         {
             menuItem.title = NSLocalizedString(@"Stop Encoding", nil);
-            menuItem.keyEquivalent = @".";
 
             return YES;
         }
@@ -1015,7 +1013,7 @@
                              didEndSelector:@selector(didDimissEditCurrentJob:returnCode:contextInfo:)
                                 contextInfo:(__bridge void *)(job)];
         }
-        else
+        else if (job.state != HBJobStateWorking)
         {
             // since we are not a currently encoding item, we can just be edit it
             HBJob *item = [[self.jobs[row] representedObject] copy];