mirror of
https://github.com/FunKey-Project/RetroFE.git
synced 2026-01-27 02:05:06 +01:00
Backed out changeset: 4c1490f861ab
This commit is contained in:
parent
c1e97dba4d
commit
4024530975
@ -368,7 +368,7 @@ bool RetroFE::Back(bool &exit)
|
||||
Config.GetProperty("exitOnFirstPageBack", exitOnBack);
|
||||
exit = false;
|
||||
|
||||
if(CurrentPage->GetMenuDepth() <= 1)
|
||||
if(CurrentPage->GetMenuDepth() == 0)
|
||||
{
|
||||
exit = exitOnBack;
|
||||
}
|
||||
@ -444,10 +444,6 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
|
||||
Config.SetCurrentCollection(NextPageItem->GetName());
|
||||
CollectionInfo *info = GetCollection(NextPageItem->GetName());
|
||||
|
||||
MenuParser mp;
|
||||
mp.GetMenuItems(info);
|
||||
CurrentPage->PushCollection(info);
|
||||
|
||||
page->PushCollection(info);
|
||||
state = RETROFE_NEXT_PAGE_REQUEST;
|
||||
}
|
||||
@ -456,7 +452,7 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
|
||||
|
||||
if (keys[Input.GetScancode(UserInput::KeyCodeBack)])
|
||||
{
|
||||
if(Back(exit) || exit)
|
||||
if(Back(exit))
|
||||
{
|
||||
state = (exit) ? RETROFE_QUIT_REQUEST : RETROFE_BACK_REQUEST;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user