Commit a71707c1 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix a crash in the MacOS X vout if p_real_vout isn't available yet.

parent 59cd4c2c
...@@ -358,6 +358,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -358,6 +358,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
vlc_value_t val; vlc_value_t val;
if( !p_real_vout ) return;
if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool) if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool)
{ {
val.b_bool = VLC_FALSE; val.b_bool = VLC_FALSE;
...@@ -372,6 +373,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -372,6 +373,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
- (void)toggleFullscreen - (void)toggleFullscreen
{ {
vlc_value_t val; vlc_value_t val;
if( !p_real_vout ) return;
var_Get( p_real_vout, "fullscreen", &val ); var_Get( p_real_vout, "fullscreen", &val );
val.b_bool = !val.b_bool; val.b_bool = !val.b_bool;
var_Set( p_real_vout, "fullscreen", val ); var_Set( p_real_vout, "fullscreen", val );
...@@ -425,7 +427,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -425,7 +427,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
/* Escape should always get you out of fullscreen */ /* Escape should always get you out of fullscreen */
if( key == (unichar) 0x1b ) if( key == (unichar) 0x1b )
{ {
if( [self isFullscreen] ) if( p_real_vout && [self isFullscreen] )
{ {
[self toggleFullscreen]; [self toggleFullscreen];
} }
......
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