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

macosx: enter fullscreen only if we were on Lion or we got an actual video to show (fixes #5611)

this commit also fixes a xib incompatiblity with 10.5
(cherry picked from commit 72187886ff68b6bbf4c36e6fe852b11244e84ed9)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent dbb7c718
...@@ -913,10 +913,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -913,10 +913,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
else else
[o_bottombar_view setHidden: NO]; [o_bottombar_view setHidden: NO];
} }
else
{
[o_fullscreen_btn setEnabled: b_videoPlayback];
}
} }
- (void)resizeWindow - (void)resizeWindow
......
...@@ -1342,7 +1342,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1342,7 +1342,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
{ {
input_thread_t * p_input = pl_CurrentInput( VLCIntf ); input_thread_t * p_input = pl_CurrentInput( VLCIntf );
if( p_input != NULL ) if( p_input != NULL && [self activeVideoPlayback])
{ {
if(b_fullscreen) if(b_fullscreen)
[o_mainwindow performSelectorOnMainThread:@selector(enterFullscreen) withObject:nil waitUntilDone:NO]; [o_mainwindow performSelectorOnMainThread:@selector(enterFullscreen) withObject:nil waitUntilDone:NO];
......
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