diff options
| author | Damiano Galassi <[email protected]> | 2016-11-21 18:34:00 +0100 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2016-11-21 18:34:00 +0100 |
| commit | 66f68fa5b4f1c0312182fa3937fe8d7e163096d0 (patch) | |
| tree | f6d8b2434beec4bce0ca1edbfca0aabde2b5006f /macosx | |
| parent | 69f3bfce6086952235d446c351007fb7f32cf9b1 (diff) | |
MacGui: fix the stop button to properly stop the encode if libhb state is HBStateSearching.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBController.m | 2 | ||||
| -rw-r--r-- | macosx/HBQueueController.m | 2 | ||||
| -rw-r--r-- | macosx/HBStateFormatter+Private.m | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/macosx/HBController.m b/macosx/HBController.m index b6c06f519..a223ef54f 100644 --- 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 53aef5e05..318233714 100644 --- 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 ffce1c068..809617e11 100644 --- 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) |