]> git.sesse.net Git - vlc/commitdiff
Qt menus: fix popup submenus non disparition
authorJean-Philippe Andre <jpeg@via.ecp.fr>
Tue, 17 Jun 2008 19:09:03 +0000 (21:09 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Wed, 18 Jun 2008 05:00:05 +0000 (22:00 -0700)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/gui/qt4/menus.cpp

index 6744388eacf21dde58efa6561096b9c66948fb6b..7850c30eddf4a2c3546f7d922bcb87e97f7586d6 100644 (file)
@@ -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 );