From d1503b1298211fcebabc8e19cc647485e0464356 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 16 Sep 2007 08:27:49 +0000 Subject: [PATCH] Try to fix memleaks --- modules/gui/qt4/components/extended_panels.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index fa5071b073..7172c4b3e3 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -604,15 +604,15 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : /* Write down initial values */ aout_instance_t *p_aout = (aout_instance_t *)vlc_object_find(p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE); - char *psz_af = NULL; + char *psz_af; char *psz_bands; float f_preamp; if( p_aout ) { - psz_af = var_GetString( p_aout, "audio-filter" ); + psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); if( var_GetBool( p_aout, "equalizer-2pass" ) ) ui.eq2PassCheck->setChecked( true ); - psz_bands = var_GetString( p_aout, "equalizer-bands" ); + psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" ); f_preamp = var_GetFloat( p_aout, "equalizer-preamp" ); vlc_object_release( p_aout ); } @@ -626,6 +626,7 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) : } if( psz_af && strstr( psz_af, "equalizer" ) != NULL ) ui.enableCheck->setChecked( true ); + free( psz_af ); enable( ui.enableCheck->isChecked() ); setValues( psz_bands, f_preamp ); @@ -849,11 +850,11 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : /* Write down initial values */ aout_instance_t *p_aout = (aout_instance_t *) vlc_object_find(p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE); - char *psz_af = NULL; + char *psz_af; if( p_aout ) { - psz_af = var_GetString( p_aout, "audio-filter" ); + psz_af = var_GetNonEmptyString( p_aout, "audio-filter" ); for( int i = 0; i < NUM_SP_CTRL ; i++) { controlVars[i] = var_GetFloat( p_aout, psz_control_names[i] ); @@ -870,6 +871,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) : } if( psz_af && strstr( psz_af, "spatializer" ) != NULL ) ui.enableCheck->setChecked( true ); + free( psz_af ); enable( ui.enableCheck->isChecked() ); setValues( controlVars ); -- 2.39.2