Commit 11981e96 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix the fullscreen button.

parent d0b60e65
...@@ -487,20 +487,19 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -487,20 +487,19 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
[self setSubmenusEnabled: FALSE]; [self setSubmenusEnabled: FALSE];
[self manageVolumeSlider]; [self manageVolumeSlider];
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); /* Check if we need to start playing */
if( p_intf->b_play )
if( p_playlist )
{ {
/* Check if we need to start playing */ p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_intf->b_play )
if( p_playlist )
{ {
playlist_Play( p_playlist ); playlist_Play( p_playlist );
vlc_object_release( p_playlist );
} }
var_Get( p_playlist, "fullscreen", &val );
[o_btn_fullscreen setState: val.b_bool];
vlc_object_release( p_playlist );
} }
[o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
} }
- (void)initStrings - (void)initStrings
...@@ -866,14 +865,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -866,14 +865,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
{ {
vout_thread_t * p_vout; vout_thread_t * p_vout;
vlc_value_t val; vlc_value_t val;
if( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )
{ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
[o_btn_fullscreen setState:VLC_TRUE];
}
else
{
[o_btn_fullscreen setState:VLC_FALSE];
}
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_vout != NULL ) if( p_vout != NULL )
{ {
......
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