Commit fe8f6c93 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

macosx: fixed crash when closing the main window while using Lion's native fullscreen mode

(cherry picked from commit 37c1667dd5022a3404775ee7657412e000462807)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0fa5f398
...@@ -1184,7 +1184,8 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1184,7 +1184,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fullscreen_btn setState: NO]; [o_fullscreen_btn setState: NO];
/* We always try to do so */ /* We always try to do so */
[NSScreen unblackoutScreens]; if (!(OSX_LION && b_nativeFullscreenMode))
[NSScreen unblackoutScreens];
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if (p_vout) if (p_vout)
{ {
...@@ -1347,10 +1348,11 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1347,10 +1348,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)orderOut: (id)sender - (void)orderOut: (id)sender
{ {
[super orderOut: sender];
/* Make sure we leave fullscreen */ /* Make sure we leave fullscreen */
[self leaveFullscreenAndFadeOut: YES]; if (!(OSX_LION && b_nativeFullscreenMode))
[self leaveFullscreenAndFadeOut: YES];
[super orderOut: sender];
} }
- (void)makeKeyAndOrderFront: (id)sender - (void)makeKeyAndOrderFront: (id)sender
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment