[vlc-devel] commit: qt4_skins2: fix a crash that occure when using skins2. ( Rémi Duraffort )

git version control git at videolan.org
Sat Jan 24 12:59:11 CET 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jan 24 12:19:10 2009 +0100| [e710aeb8573e23d209dc1fa7b8a3c3adfd23783b] | committer: Rémi Duraffort 

qt4_skins2: fix a crash that occure when using skins2.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e710aeb8573e23d209dc1fa7b8a3c3adfd23783b
---

 modules/gui/qt4/dialogs_provider.hpp |    2 +-
 modules/gui/qt4/main_interface.cpp   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 997257b..c08a6a5 100644
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -203,7 +203,7 @@ public:
         i_arg = _i_arg;
         p_arg = _p_arg;
     };
-    virtual ~DialogEvent() { delete p_arg; };
+    virtual ~DialogEvent() { };
 
     int i_arg, i_dialog;
     intf_dialog_args_t *p_arg;
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index bce2c8c..e58b443 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1123,7 +1123,7 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
     if( p_intf->pf_show_dialog )
     {
         p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
-                                new_val.b_bool, 0 );
+                                new_val.b_bool, NULL );
     }
 
     return VLC_SUCCESS;




More information about the vlc-devel mailing list