]> granicus.if.org Git - handbrake/commitdiff
MacGui: do not stop the preview encoding when the showWindow: is called and the windo...
authorDamiano Galassi <damiog@gmail.com>
Fri, 22 Apr 2016 11:25:20 +0000 (13:25 +0200)
committerDamiano Galassi <damiog@gmail.com>
Fri, 22 Apr 2016 11:25:20 +0000 (13:25 +0200)
macosx/HBPreviewController.m

index be881dd733a0215297ca595d8cdc90972767fcb5..4e7d259e296b80ef94a2ef1aea12650fd8528b39 100644 (file)
@@ -202,6 +202,7 @@ typedef enum ViewMode : NSUInteger {
     else
     {
         self.previewView.image = nil;
+        [self hideHud];
         self.window.title = NSLocalizedString(@"Preview", nil);
     }
 }
@@ -210,6 +211,7 @@ typedef enum ViewMode : NSUInteger {
 {
     if (self.generator)
     {
+        [self.generator cancel];
         [self switchViewToMode:ViewModePicturePreview];
         [self displayPreviewAtIndex:self.pictureIndex];
     }
@@ -223,7 +225,7 @@ typedef enum ViewMode : NSUInteger {
     {
         [self startMovieTimer];
     }
-    else
+    else if (self.currentViewMode == ViewModePicturePreview)
     {
         [self reloadPreviews];
     }