summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2016-04-22 13:25:20 +0200
committerDamiano Galassi <[email protected]>2016-04-22 13:25:20 +0200
commit4d23e1dff4bb63575e586a8da8793891fa67bad4 (patch)
tree209053dc622c76aad8d7bab33436231ccf04ef30
parent273444ac2bf202a1c6b275b07b5a65532d2e2102 (diff)
MacGui: do not stop the preview encoding when the showWindow: is called and the window is already on screen.
-rw-r--r--macosx/HBPreviewController.m4
1 files changed, 3 insertions, 1 deletions
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];
}