Skip to content

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

Qt4 - Fix the double free. Close #1397.

parent 16d5fb23
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ e2c2279d
...@@ -67,14 +67,10 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -67,14 +67,10 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
/* retrieve last known path used in file browsing */ /* retrieve last known path used in file browsing */
char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" ); char *psz_filepath = config_GetPsz( p_intf, "qt-filedialog-path" );
if( EMPTY_STR( psz_filepath ) )
{
psz_filepath = p_intf->p_libvlc->psz_homedir;
}
// Make this QFileDialog a child of tempWidget from the ui. // Make this QFileDialog a child of tempWidget from the ui.
dialogBox = new FileOpenBox( ui.tempWidget, NULL, dialogBox = new FileOpenBox( ui.tempWidget, NULL,
qfu( psz_filepath ), fileTypes ); qfu( EMPTY_STR( psz_filepath ) ? psz_filepath : p_intf->p_libvlc->psz_homedir ), fileTypes );
delete psz_filepath; delete psz_filepath;
dialogBox->setFileMode( QFileDialog::ExistingFiles ); dialogBox->setFileMode( QFileDialog::ExistingFiles );
......
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