[vlc-devel] commit: Qt menus: fix popup submenus non disparition (Jean-Philippe Andre )

[git version control]

vlc | branch: master | Jean-Philippe Andre <jpeg at via.ecp.fr> | Tue Jun 17 21:09:03 2008 +0200| [03525e493820f8a2900e182d7df61f8c2aaba117]

Qt menus: fix popup submenus non disparition

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

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

 modules/gui/qt4/menus.cpp |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 6744388..7850c30 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -772,17 +772,20 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
             InputAutoMenuBuilder( VLC_OBJECT( p_input ), objects, varnames );
             vlc_object_release( p_input );
 
-            action = menu->addMenu( AudioMenu( p_intf, NULL ) );
+            submenu = new QMenu( menu );
+            action = menu->addMenu( AudioMenu( p_intf, submenu ) );
             action->setText( qtr( "&Audio" ) );
             if( action->menu()->isEmpty() )
                 action->setEnabled( false );
 
-            action = menu->addMenu( VideoMenu( p_intf, NULL ) );
+            submenu = new QMenu( menu );
+            action = menu->addMenu( VideoMenu( p_intf, submenu ) );
             action->setText( qtr( "&Video" ) );
             if( action->menu()->isEmpty() )
                 action->setEnabled( false );
 
-            action = menu->addMenu( NavigMenu( p_intf, NULL ) );
+            submenu = new QMenu( menu );
+            action = menu->addMenu( NavigMenu( p_intf, submenu ) );
             action->setText( qtr( "&Playback" ) );
             if( action->menu()->isEmpty() )
                 action->setEnabled( false );