MacGui: fix the stop button to properly stop the encode if libhb state is HBStateSear...

diff --git a/macosx/HBController.m b/macosx/HBController.m
index b6c06f519398c73b16ebd654780c3d417cb43fd0..a223ef54f2b71a9b52ccdb4f3252365fd2036442 100644 (file)
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -1040,7 +1040,7 @@
 - (IBAction)rip:(id)sender
 {
     // Rip or Cancel ?
-    if (fQueueController.core.state == HBStateWorking || fQueueController.core.state == HBStatePaused)
+    if (fQueueController.core.state == HBStateWorking || fQueueController.core.state == HBStatePaused || fQueueController.core.state == HBStateSearching)
        {
         // Displays an alert asking user if the want to cancel encoding of current job.
         [fQueueController cancelRip:self];

diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index 53aef5e05370f66c71b6c5ad950daf7e9c5e7d3f..31823371430910fdd86d03e31c445156b928e049 100644 (file)
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -1114,7 +1114,7 @@
 - (IBAction)rip:(id)sender
 {
     // Rip or Cancel ?
-    if (self.core.state == HBStateWorking || self.core.state == HBStatePaused)
+    if (self.core.state == HBStateWorking || self.core.state == HBStatePaused || self.core.state == HBStateSearching)
     {
         [self cancelRip:sender];
     }

diff --git a/macosx/HBStateFormatter+Private.m b/macosx/HBStateFormatter+Private.m
index ffce1c0687dd4fa7b4a2d16bd5242e5366f4e1cb..809617e11f4b9e15656ac86c89b9e4bc8728ae6a 100644 (file)
--- a/macosx/HBStateFormatter+Private.m
+++ b/macosx/HBStateFormatter+Private.m
@@ -21,7 +21,7 @@
         case HB_STATE_SEARCHING:
         {
             [string appendFormat:
-             NSLocalizedString(@"Searching for start point… :  %.2f %%", nil),
+             NSLocalizedString(@"Searching for start point:  %.2f %%", nil),
              100.0 * p.progress];
 
             if (p.seconds > -1)