MacGui: Picture Preview and Settings window interaction fixes

- Putting the Preview Window into full screen mode no longer automatically opens up the Picture Settings inspector
- Fixed the Picture Settings inspector so that it isn't on top of every f'ing window on your screen.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index b0891342a..7d07da08f 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -207,8 +207,11 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 
 - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) app
 {
-    [fPreviewController goWindowedScreen:nil];
-    // Warn if encoding a movie
+    if ([fPreviewController fullScreen] == YES)
+    {
+        [fPreviewController goWindowedScreen:nil];
+    }
+    
     hb_state_t s;
     hb_get_state( fQueueEncodeLibhb, &s );