funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-14 10:48:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed exitOnFirstPageBack option. Readded support for nested subcollections.

Browse Source
This commit is contained in:
emb 2015-03-08 14:30:49 -05:00
parent 6d69a454d3
commit c1e97dba4d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RetroFE/Source/RetroFE.cpp
View File

@ -368,7 +368,7 @@ bool RetroFE::Back(bool &exit)
Config.GetProperty("exitOnFirstPageBack", exitOnBack); Config.GetProperty("exitOnFirstPageBack", exitOnBack);
exit = false; exit = false;
if(CurrentPage->GetMenuDepth() == 0) if(CurrentPage->GetMenuDepth() <= 1)
{ {
exit = exitOnBack; exit = exitOnBack;
} }
@ -444,6 +444,10 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
Config.SetCurrentCollection(NextPageItem->GetName()); Config.SetCurrentCollection(NextPageItem->GetName());
CollectionInfo *info = GetCollection(NextPageItem->GetName()); CollectionInfo *info = GetCollection(NextPageItem->GetName());
MenuParser mp;
mp.GetMenuItems(info);
CurrentPage->PushCollection(info);
page->PushCollection(info); page->PushCollection(info);
state = RETROFE_NEXT_PAGE_REQUEST; state = RETROFE_NEXT_PAGE_REQUEST;
} }
@ -452,7 +456,7 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
if (keys[Input.GetScancode(UserInput::KeyCodeBack)]) if (keys[Input.GetScancode(UserInput::KeyCodeBack)])
{ {
if(Back(exit)) if(Back(exit) || exit)
{ {
state = (exit) ? RETROFE_QUIT_REQUEST : RETROFE_BACK_REQUEST; state = (exit) ? RETROFE_QUIT_REQUEST : RETROFE_BACK_REQUEST;
} }