Skip to content

V
vlc-2-2
Commit a2df1797 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: do not delete parented QDialogs 

Ref #7431 #5377
parent 82f89ed6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ a2df1797
...@@ -1026,7 +1026,6 @@ void SPrefsPanel::assoDialog() ...@@ -1026,7 +1026,6 @@ void SPrefsPanel::assoDialog()
CONNECT( clearButton, clicked(), d, reject() ); CONNECT( clearButton, clicked(), d, reject() );
d->resize( 300, 400 ); d->resize( 300, 400 );
d->exec(); d->exec();
delete d;
delete qvReg; delete qvReg;
listAsso.clear(); listAsso.clear();
} }
...@@ -1041,7 +1040,7 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext ) ...@@ -1041,7 +1040,7 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext )
if( !EMPTY_STR(psz_value) ) if( !EMPTY_STR(psz_value) )
qvReg->WriteRegistryString( psz_ext, "VLC.backup", psz_value ); qvReg->WriteRegistryString( psz_ext, "VLC.backup", psz_value );
delete psz_value; free( psz_value );
/* Put a "link" to VLC.EXT as default */ /* Put a "link" to VLC.EXT as default */
qvReg->WriteRegistryString( psz_ext, "", qtu( s_path ) ); qvReg->WriteRegistryString( psz_ext, "", qtu( s_path ) );
...@@ -1083,7 +1082,7 @@ void delAsso( QVLCRegistry *qvReg, const char *psz_ext ) ...@@ -1083,7 +1082,7 @@ void delAsso( QVLCRegistry *qvReg, const char *psz_ext )
qvReg->DeleteKey( psz_ext, "VLC.backup" ); qvReg->DeleteKey( psz_ext, "VLC.backup" );
} }
delete( psz_value ); free( psz_value );
} }
void SPrefsPanel::saveAsso() void SPrefsPanel::saveAsso()
{ {
......
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