]> git.sesse.net Git - vlc/commitdiff
Qt4: fix a crash (kind of a 'use after free' error).
authorRémi Duraffort <ivoire@videolan.org>
Thu, 29 Apr 2010 17:16:09 +0000 (19:16 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Thu, 29 Apr 2010 17:16:09 +0000 (19:16 +0200)
modules/gui/qt4/menus.cpp

index da1b3fb4a035b288437f1f38694c092ccf0865b2..fb874ffb21266d7b153076289eb6a59f74991459 100644 (file)
@@ -439,9 +439,9 @@ QMenu *QVLCMenu::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterface
         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 );
+            if( m && m->parent() == menu ) delete m;
         }
     }