MacGui: Picture Settings - If Preview is in full screen and pic settings are open...

- Fixes issue where going into full screen mode in preview requires two clicks on the settings button to get the inspector to show on top of the full screen preview.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2229 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 3c078191bc63815353e37363556961086e741893..19be913ba306ebd9d039fdb17e140b6d71712ca9 100644 (file)
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -36,20 +36,22 @@
 //------------------------------------------------------------------------------------
 - (IBAction) showPictureWindow: (id)sender
 {
-    if ([[self window] isVisible])
+    if ([fPreviewController fullScreen] == YES)
     {
-        [[self window] close];
+        [self showWindow:sender];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+        [self setToFullScreenMode];
     }
     else
     {
-        [self showWindow:sender];
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
-        if ([fPreviewController fullScreen] == YES)
+        if ([[self window] isVisible])
         {
-            [self setToFullScreenMode];
+            [[self window] close];
         }
         else
         {
+            [self showWindow:sender];
+            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
             [self setToWindowedMode];
         }
     }