Skip to content

V
vlc-2-2
Commit ee6488a5 authored by Ludovic Fauvet's avatar Ludovic Fauvet
Browse files
Options

Qt: simple_prefs: fix crash when reading psz_aout

parent d65cf999
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ ee6488a5
...@@ -342,7 +342,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -342,7 +342,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
int i_volume = 100; //FIXME not foolproof int i_volume = 100; //FIXME not foolproof
#define get_vol_aout( name ) \ #define get_vol_aout( name ) \
module_exists( name ) && ( !strcmp( psz_aout, name ) || !strcmp( psz_aout, "any" ) ) module_exists( name ) && ( !psz_aout || !strcmp( psz_aout, name ) || !strcmp( psz_aout, "any" ) )
#if defined( _WIN32 ) #if defined( _WIN32 )
if( get_vol_aout( "directx" ) ) if( get_vol_aout( "directx" ) )
...@@ -909,7 +909,7 @@ void SPrefsPanel::apply() ...@@ -909,7 +909,7 @@ void SPrefsPanel::apply()
float f_gain = powf( i_volume / 100.f, 3 ); float f_gain = powf( i_volume / 100.f, 3 );
#define save_vol_aout( name ) \ #define save_vol_aout( name ) \
module_exists( name ) && ( !strcmp( psz_aout, name ) || !strcmp( psz_aout, "any" ) ) module_exists( name ) && ( !psz_aout || !strcmp( psz_aout, name ) || !strcmp( psz_aout, "any" ) )
//FIXME this is moot //FIXME this is moot
#if defined( _WIN32 ) #if defined( _WIN32 )
......
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