[vlc-commits] commit: Qt4: fix a crash (kind of a 'use after free' error). ( Rémi Duraffort )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Apr 29 19:16:09 2010 +0200| [5d24fbfb1bbfb5e8c1480e415840ec99f92c5e3a] | committer: Rémi Duraffort 

Qt4: fix a crash (kind of a 'use after free' error).
(cherry picked from commit 13c520d1c893ebc8420804d1c7b42c1e8fbab9b8)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=5d24fbfb1bbfb5e8c1480e415840ec99f92c5e3a
---

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

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index da1b3fb..fb874ff 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -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;
         }
     }