]> git.sesse.net Git - vlc/commitdiff
Don't mix malloc and delete.
authorRémi Duraffort <ivoire@videolan.org>
Thu, 31 Jul 2008 16:26:26 +0000 (18:26 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Thu, 31 Jul 2008 16:26:48 +0000 (18:26 +0200)
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/simple_preferences.cpp

index a37dc279d2562c650b197a7624abadc102954d8a..5d7b426a3683d0afd6ba5a41f92dd6476fa67ace 100644 (file)
@@ -273,9 +273,9 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
 
 DiscOpenPanel::~DiscOpenPanel()
 {
-    delete psz_dvddiscpath;
-    delete psz_vcddiscpath;
-    delete psz_cddadiscpath;
+    free( psz_dvddiscpath );
+    free( psz_vcddiscpath );
+    free( psz_cddadiscpath );
 }
 
 void DiscOpenPanel::clear()
index 2f62769b096d68042fbe9bc6fae8b0b1d3aa1350..206283f2766272383d8daedf10f23100fd9b4f17 100644 (file)
@@ -365,8 +365,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 {
                     ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
                 }
-                delete psz_cddadiscpath; delete psz_dvddiscpath;
-                delete psz_vcddiscpath;
+                free( psz_cddadiscpath );
+                free( psz_dvddiscpath );
+                free( psz_vcddiscpath );
             }
 
             CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );