i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot loader: text menu: run_menu(): Fix empty menu crash

Browse Source
This commit is contained in:
Ingo Weinhold
2013-11-30 19:25:56 +01:00
parent 25a83d13b9
commit 2a368f9b0e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/generic/text_menu.cpp
+4 -1
View File
@@ -413,6 +413,9 @@ run_menu(Menu* menu)
item = menu->ItemAt(selected); item = menu->ItemAt(selected);
if (TEXT_CONSOLE_IS_CURSOR_KEY(key)) { if (TEXT_CONSOLE_IS_CURSOR_KEY(key)) {
if (item == NULL)
continue;
int32 oldSelected = selected; int32 oldSelected = selected;
switch (key) { switch (key) {
@@ -460,7 +463,7 @@ run_menu(Menu* menu)
} }
} else if (key == TEXT_CONSOLE_KEY_RETURN } else if (key == TEXT_CONSOLE_KEY_RETURN
|| key == TEXT_CONSOLE_KEY_SPACE) { || key == TEXT_CONSOLE_KEY_SPACE) {
if (invoke_item(menu, item, selected, key)) if (item != NULL && invoke_item(menu, item, selected, key))
break; break;
} else if (key == TEXT_CONSOLE_KEY_ESCAPE } else if (key == TEXT_CONSOLE_KEY_ESCAPE
&& menu->Type() != MAIN_MENU) { && menu->Type() != MAIN_MENU) {