From: Damiano Galassi <damiog@gmail.com>
Date: Fri, 22 Apr 2016 11:25:20 +0000 (+0200)
Subject: MacGui: do not stop the preview encoding when the showWindow: is called and the windo... 
X-Git-Tag: 1.0.0~511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d23e1dff4bb63575e586a8da8793891fa67bad4;p=handbrake

MacGui: do not stop the preview encoding when the showWindow: is called and the window is already on screen.
---

diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m
index be881dd73..4e7d259e2 100644
--- a/macosx/HBPreviewController.m
+++ b/macosx/HBPreviewController.m
@@ -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];
     }