MacGui: Fix crash when trying to quit with preview in full screen mode.

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

1 files changed, 10 insertions, 4 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 287b4944b..2e73266dc 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -208,9 +208,14 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 
 - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) app
 {
-    if ([fPreviewController fullScreen] == YES)
+    /* if we are in preview full screen mode, we need to go to
+     * windowed mode and release the display before we terminate.
+     * We do it here (instead of applicationWillTerminate) so we 
+     * release the displays and can then see the alerts below.
+     */
+    if ([fPictureController previewFullScreenMode] == YES)
     {
-        [fPreviewController goWindowedScreen:nil];
+        [fPictureController previewGoWindowed:nil];
     }
     
     hb_state_t s;
@@ -250,13 +255,14 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
-	[browsedSourceDisplayName release];
+    
+    [browsedSourceDisplayName release];
     [outputPanel release];
 	[fQueueController release];
+    [fPreviewController release];
     [fPictureController release];
     [fPictureFilterController release];
     
-    [fPreviewController release];
 	hb_close(&fHandle);
     hb_close(&fQueueEncodeLibhb);
 }