Skip to content

V
vlc-2-2
Commit 447b4ce7 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

fix a segfault (i didn't know strstr segfaulted when the haystak was NULL ...)

parent 7189e5d5
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/wxwindows/extrapanel.cpp
View file @ 447b4ce7
...@@ -546,7 +546,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent ) ...@@ -546,7 +546,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf, aout_instance_t *p_aout= (aout_instance_t *)vlc_object_find(p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE); VLC_OBJECT_AOUT, FIND_ANYWHERE);
char *psz_af; char *psz_af = NULL;
if( p_aout ) if( p_aout )
{ {
psz_af = var_GetString( p_aout, "audio-filter" ); psz_af = var_GetString( p_aout, "audio-filter" );
...@@ -559,7 +559,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent ) ...@@ -559,7 +559,7 @@ wxPanel *ExtraPanel::EqzPanel( wxWindow *parent )
if( config_GetInt( p_intf, "equalizer-2pass" ) ) if( config_GetInt( p_intf, "equalizer-2pass" ) )
eq_2p_chkbox->SetValue( true ); eq_2p_chkbox->SetValue( true );
} }
if( strstr( psz_af, "equalizer" ) != NULL ) if( psz_af != NULL ? strstr( psz_af, "equalizer" ) != NULL : VLC_FALSE )
{ {
eq_chkbox->SetValue( true ); eq_chkbox->SetValue( true );
} else { } else {
......
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