Skip to content

Commit 32d7dc1

Browse files
committed
Fix regression reset on select
I removed the option to reset the menu when `select` is called without considering the use case where users always want to reset. This commit adds it back in.
1 parent c178f76 commit 32d7dc1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

MenuSystem.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,14 @@ void MenuSystem::reset()
226226
_p_root_menu->reset();
227227
}
228228

229-
void MenuSystem::select()
229+
void MenuSystem::select(bool reset)
230230
{
231231
MenuComponent* pComponent = _p_curr_menu->activate();
232232

233233
if (pComponent != NULL)
234234
_p_curr_menu = (Menu*) pComponent;
235+
else
236+
if (reset) this->reset();
235237
}
236238

237239
boolean MenuSystem::back()

MenuSystem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class MenuSystem
8383
boolean next(boolean loop=false);
8484
boolean prev(boolean loop=false);
8585
void reset();
86-
void select();
86+
void select(boolean reset=false);
8787
boolean back();
8888

8989
void set_root_menu(Menu* p_root_menu);

0 commit comments

Comments
 (0)