From c053b4a9f88163383f688281e8b04e696323aa60 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 20 Nov 2007 12:58:50 +0000 Subject: [PATCH] Moved call to _DeleteMenuWindow() to a better place git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22963 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Menu.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index dc1e7ef3d1..0c214a8f82 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1327,7 +1327,7 @@ BMenu::_Show(bool selectFirstItem) void BMenu::_Hide() { - BMenuWindow *window = static_cast(Window()); + BMenuWindow *window = dynamic_cast(Window()); if (window == NULL || !window->Lock()) return; @@ -1338,15 +1338,15 @@ BMenu::_Hide() window->DetachMenu(); // we don't want to be deleted when the window is removed - // Delete the menu window used by our submenus - _DeleteMenuWindow(); - if (fSuper != NULL) window->Unlock(); else { // it's our window, quit it window->Quit(); - } + } + + // Delete the menu window used by our submenus + _DeleteMenuWindow(); }