From deab92e7edbd508ea6068c3fee28343d1b7cdbd0 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 13 Mar 2006 20:36:04 +0000 Subject: [PATCH] Minor changes, fixed a possible leak in Uninstall() git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16773 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/MenuItem.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index a0229a0514..5c6f7ea4f9 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -625,8 +625,7 @@ BMenuItem::Uninstall() if (Target() == fWindow) SetTarget(BMessenger()); - // TODO: I'm not sure about B_COMMAND_KEY - if (fShortcutChar != 0 && (fModifiers & B_COMMAND_KEY) && fWindow != NULL) + if (fShortcutChar != 0 && fModifiers != 0 && fWindow != NULL) fWindow->RemoveShortcut(fShortcutChar, fModifiers); fWindow = NULL; @@ -652,10 +651,7 @@ BMenuItem::Select(bool selected) if (fSelected == selected) return; - if (Submenu()) { - fSelected = selected; - Highlight(selected); - } else if (IsEnabled()) { + if (Submenu() || IsEnabled()) { fSelected = selected; Highlight(selected); }