diff --git a/src/system/boot/platform/atari_m68k/video.cpp b/src/system/boot/platform/atari_m68k/video.cpp index 073f492db2..1a99acafeb 100644 --- a/src/system/boot/platform/atari_m68k/video.cpp +++ b/src/system/boot/platform/atari_m68k/video.cpp @@ -1023,10 +1023,10 @@ video_mode_hook(Menu *menu, MenuItem *item) // find selected mode video_mode *mode = NULL; - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - switch (menu->IndexOf(item)) { + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + switch (submenu->IndexOf(subitem)) { case 0: // "Default" mode special sMode = sDefaultMode; @@ -1037,7 +1037,7 @@ video_mode_hook(Menu *menu, MenuItem *item) // sets sMode to NULL which triggers VGA mode //break; default: - mode = (video_mode *)item->Data(); + mode = (video_mode *)subitem->Data(); break; } } diff --git a/src/system/boot/platform/bios_ia32/video.cpp b/src/system/boot/platform/bios_ia32/video.cpp index 220db2d5a3..9e5573bb98 100644 --- a/src/system/boot/platform/bios_ia32/video.cpp +++ b/src/system/boot/platform/bios_ia32/video.cpp @@ -645,10 +645,10 @@ video_mode_hook(Menu *menu, MenuItem *item) // find selected mode video_mode *mode = NULL; - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - switch (menu->IndexOf(item)) { + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + switch (submenu->IndexOf(subitem)) { case 0: // "Default" mode special sMode = sDefaultMode; @@ -659,7 +659,7 @@ video_mode_hook(Menu *menu, MenuItem *item) // sets sMode to NULL which triggers VGA mode break; default: - mode = (video_mode *)item->Data(); + mode = (video_mode *)subitem->Data(); break; } } diff --git a/src/system/boot/platform/efi/video.cpp b/src/system/boot/platform/efi/video.cpp index bc7e35e6a5..bd97ad973a 100644 --- a/src/system/boot/platform/efi/video.cpp +++ b/src/system/boot/platform/efi/video.cpp @@ -261,10 +261,10 @@ platform_switch_to_logo(void) bool video_mode_hook(Menu *menu, MenuItem *item) { - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - sGraphicsMode = (UINTN)item->Data(); + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + sGraphicsMode = (UINTN)subitem->Data(); sModeChosen = true; }