eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Adds quiet boot option to hide menu duing countdown"

Browse Source
This commit is contained in:
Martin White
2019-06-04 23:26:47 +01:00
committed by GitHub
parent 97866de58d
commit e5c3b75167
4 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
menu.cpp
View File

@@ -469,16 +469,7 @@ static uint32_t menu_key_get(void)
c2 = c1;
// inject a fake "MENU_KEY" if no menu is visible and the menu key is loaded
if (!cfg.bootcore_quiet)
{
if (!user_io_osd_is_visible() && !video_fb_state() && is_menu_core()) c = KEY_F12;
}
else
{
// Enable key events in OSD
user_io_osd_key_enable(1);
}
if (!user_io_osd_is_visible() && !video_fb_state() && is_menu_core()) c = KEY_F12;
// generate repeat "key-pressed" events
if ((c1 & UPSTROKE) || (!c1))
@@ -814,11 +805,6 @@ void HandleUI(void)
{
cfg.bootcore[0] = '\0';
}
else if (c && cfg.bootcore_quiet)
{
cfg.bootcore_quiet = 0;
menu = true;
}
if (is_menu_core())
{
@@ -4276,13 +4262,6 @@ void HandleUI(void)
OsdWrite(16, "", 1, 0);
OsdWrite(17, str, 1, 0);
OsdWrite(18, "", 1, 0);
// Override and hide OSD but countdown still happens
if (cfg.bootcore_quiet)
{
menustate = MENU_NONE1;
OsdClear();
}
}
}
}