[vlc-commits] Qt: fix a crash when using the skins

Jean-Baptiste Kempf git at videolan.org
Mon Sep 10 19:37:45 CEST 2012


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Sep 10 19:36:14 2012 +0200| [d9ad3782b8bc1e651c8f574832ab6ee9996297c6] | committer: Jean-Baptiste Kempf

Qt: fix a crash when using the skins
(cherry picked from commit 7a216cf685a834d038da9b474271687167c10441)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/menus.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 177dd4f..1081988 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -950,6 +950,7 @@ void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
 {
     POPUP_BOILERPLATE
 
+    menu = new QMenu();
     if( p_input )
     {
         varnames.append( "audio-es" );
@@ -957,7 +958,6 @@ void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool show )
         menu->addSeparator();
     }
 
-    menu = new QMenu();
     Populate( p_intf, menu, varnames, objects );
 
     menu->addSeparator();



More information about the vlc-commits mailing list