- 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].

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 7e19bb2de6f4478064185fd9a365504341a76f31..ecd9005106d7439ddab376db4193860a2656edc9 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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;
 }

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 5f0f7123daa9a9876c8e0bd9a165144442bdf2b8..29b1dae4c4c07a970f48131f74b3a0de7d93c4a2 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -52,7 +52,7 @@ struct intf_sys_t
 
     VideoWidget *p_video;
 
-    char *psz_filepath;
+    const char *psz_filepath;
     QMenu * p_popup_menu;
 };