From c552bd67714954d1fd5b1be90aacaf78142037a0 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Mon, 7 Apr 2014 19:52:23 +1200 Subject: [PATCH] haiku_loader: search for matching shortcut in supermenus Fixes #7469. --- src/system/boot/loader/menu.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp index 9f91397f73..5de8c16129 100644 --- a/src/system/boot/loader/menu.cpp +++ b/src/system/boot/loader/menu.cpp @@ -414,6 +414,11 @@ Menu::FindShortcut(char key) const shortcut = shortcut->next; } + Menu *superMenu = Supermenu(); + + if (superMenu != NULL) + return superMenu->FindShortcut(key); + return NULL; } @@ -430,6 +435,11 @@ Menu::FindItemByShortcut(char key) return item; } + Menu *superMenu = Supermenu(); + + if (superMenu != NULL) + return superMenu->FindItemByShortcut(key); + return NULL; }