Commit 9cbf602b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

- Don't mix delete and free().

- Don't free/delete stuff that belongs to LibVLC - closes #1397 for real.

And this has nothing to do with [24331] or [24406].
parent c2f196a1
......@@ -335,7 +335,6 @@ static void Init( intf_thread_t *p_intf )
char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
: p_intf->p_libvlc->psz_homedir;
delete psz_path;
/* Launch */
app->exec();
......@@ -354,7 +353,7 @@ static void Init( intf_thread_t *p_intf )
MainInputManager::killInstance();
config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
delete p_intf->p_sys->psz_filepath;
free( psz_path );
delete app;
}
......
......@@ -52,7 +52,7 @@ struct intf_sys_t
VideoWidget *p_video;
char *psz_filepath;
const char *psz_filepath;
QMenu * p_popup_menu;
};
......
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