more fixes

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17043 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-04-07 17:44:02 +00:00
parent bf5d7973b9
commit 9c5c552dd6
+6 -10
View File
@@ -1199,23 +1199,19 @@ BMenu::_track(int *action, long start)
snooze(snoozeAmount); snooze(snoozeAmount);
if (localAction == MENU_ACT_CLOSE || (buttons != 0 && IsStickyMode())) if (buttons != 0 && IsStickyMode()) {
localAction = MENU_ACT_CLOSE;
break; break;
else if (buttons == 0) { } else if (buttons == 0) {
if (IsStickyPrefOn()) if (IsStickyPrefOn())
SetStickyMode(true); SetStickyMode(true);
else else {
localAction = MENU_ACT_CLOSE;
break; break;
}
} }
} }
if (localAction == MENU_ACT_NONE && okay) {
if (buttons != 0)
localAction = MENU_ACT_NONE;
else
localAction = MENU_ACT_CLOSE;
}
if (action != NULL) if (action != NULL)
*action = localAction; *action = localAction;