[vlc-commits] macosx: make sure that the non-native fullscreen mode is correctly left when a clip is over

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Jan 20 11:57:03 2012 -0800| [1ee32a2679221ac78678a173b2bf68771d2ff973] | committer: Jean-Baptiste Kempf

macosx: make sure that the non-native fullscreen mode is correctly left when a clip is over
(cherry picked from commit 9266718f657569e30e348564d37f90fdee297d36)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1ee32a2679221ac78678a173b2bf68771d2ff973
---

 modules/gui/macosx/MainWindow.m |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 7eb1b66..440d2c2 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1219,6 +1219,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [self makeFirstResponder: o_video_view];
     else
         [self makeFirstResponder: nil];
+
+    if (!b_videoPlayback && b_fullscreen && !b_nativeFullscreenMode)
+        [self leaveFullscreenAndFadeOut: YES];
 }
 
 - (void)resizeWindow
@@ -1547,7 +1550,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         if (OSX_LEOPARD)
             SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
         else
-            [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
+            [NSApp setPresentationOptions: NSApplicationPresentationDefault];
 
         /* Will release the lock */
         [self hasEndedFullscreen];