diff options
| author | ritsuka <[email protected]> | 2014-09-19 07:32:35 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2014-09-19 07:32:35 +0000 |
| commit | 3923d87e8387902f7d7d0014ff272d769e510ceb (patch) | |
| tree | 1219d5325acae969b3000b380415cd1a6dee19a8 /macosx/HBPreviewController.m | |
| parent | d1fdbb2b1d62cf2b667169f2dd7444d9d5ea791d (diff) | |
MacGui: when a live preview is cancelled, wait for libhb to end its work before reverting back the hud.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6418 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBPreviewController.m')
| -rw-r--r-- | macosx/HBPreviewController.m | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m index c92bc4e8f..43128ac20 100644 --- a/macosx/HBPreviewController.m +++ b/macosx/HBPreviewController.m @@ -232,6 +232,7 @@ typedef enum ViewMode : NSUInteger { { _title = title; + self.generator.delegate = nil; [self.generator cancel]; self.generator = nil; @@ -244,6 +245,7 @@ typedef enum ViewMode : NSUInteger { [fPictureSlider setMaxValue: self.generator.imagesCount - 1.0]; [fPictureSlider setNumberOfTickMarks: self.generator.imagesCount]; + [self switchViewToMode:ViewModePicturePreview]; [self displayPreview]; } } @@ -466,7 +468,6 @@ typedef enum ViewMode : NSUInteger { { if (self.currentViewMode == ViewModeEncoding) { - [self.generator cancel]; [self toggleBoxes:@[fPictureControlBox, fEncodingControlBox] usingIndexes:[NSIndexSet indexSetWithIndex:0]]; [fMovieCreationProgressIndicator stopAnimation:self]; @@ -858,6 +859,11 @@ typedef enum ViewMode : NSUInteger { [fMovieCreationProgressIndicator setDoubleValue: progress]; } +- (void)didCancelMovieCreation +{ + [self switchViewToMode:ViewModePicturePreview]; +} + - (void) didCreateMovieAtURL: (NSURL *) fileURL { /* Load the new movie into fMovieView */ @@ -919,7 +925,7 @@ typedef enum ViewMode : NSUInteger { - (IBAction) cancelCreateMoviePreview: (id) sender { - [self switchViewToMode:ViewModePicturePreview]; + [self.generator cancel]; } - (IBAction) createMoviePreview: (id) sender |