Commit 01e99e18 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: removed wrong check, which could make the video output disappear when...

macosx: removed wrong check, which could make the video output disappear when leaving fullscreen mode in rare cases (close #6856)
(cherry picked from commit 7100a8c8c8ba7364d5543c13ae70040a16aee17c)
parent 4a354598
...@@ -2003,13 +2003,10 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2003,13 +2003,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_video_view setFrame:[o_temp_view frame]]; [o_video_view setFrame:[o_temp_view frame]];
if( [[o_video_view subviews] count] > 0 ) if( [[o_video_view subviews] count] > 0 )
[[o_video_view window] makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]]; [[o_video_view window] makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
if( [[o_video_view window] isVisible] )
{
if( !b_nonembedded ) if( !b_nonembedded )
[super makeKeyAndOrderFront:self]; /* our version contains a workaround */ [super makeKeyAndOrderFront:self]; /* our version contains a workaround */
else else
[[o_video_view window] makeKeyAndOrderFront: self]; [[o_video_view window] makeKeyAndOrderFront: self];
}
[o_fullscreen_window orderOut: self]; [o_fullscreen_window orderOut: self];
NSEnableScreenUpdates(); NSEnableScreenUpdates();
......
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