Qt: delete submenus when clearing the View menu

Prevent unnecessary memory accumulation when new submenus are
created again and again.

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 036d72243d5c549504220d21530aaf12f629090e..51e982f349ac21969d960cc2021690783f044a23 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -430,7 +430,16 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface
     else
     {
         menu = current;
-        menu->clear();
+        //menu->clear();
+        //HACK menu->clear() does not delete submenus
+        QList<QAction*> actions = menu->actions();
+        foreach( QAction *a, actions )
+        {
+            QMenu *m = a->menu();
+            if( m && m->parent() == menu ) delete m;
+            if( a->parent() == menu ) delete a;
+            else menu->removeAction( a );
+        }
     }
 
     MainInterface *mi = _mi ? _mi : p_intf->p_sys->p_mi;