devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

option_select & time_menu : Fix unbalanced push/pop activity

Browse source 
Change-Id: Icabbabb16b2f173168a441af474ee8403b908dd4
This commit is contained in:
Christian Soffke 2022-12-30 09:45:05 +01:00
parent e180e45e01
commit b321a719d3
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/gui/option_select.c
View file

@ -565,7 +565,10 @@ bool option_screen(const struct settings_list *setting,
function(*variable); function(*variable);
} }
else if(default_event_handler(action) == SYS_USB_CONNECTED) else if(default_event_handler(action) == SYS_USB_CONNECTED)
{
pop_current_activity();
return true; return true;
}
/* callback */ /* callback */
if (function && !cb_on_select_only) if (function && !cb_on_select_only)
function(*variable); function(*variable);

4
apps/menus/time_menu.c
View file

@ -297,8 +297,10 @@ int time_screen(void* ignored)
because they always report "02:02:02" as time. because they always report "02:02:02" as time.
*/ */
struct tm *tm = get_time(); struct tm *tm = get_time();
if (tm->tm_year==102 && tm->tm_hour==2 && tm->tm_min==2 && tm->tm_sec==2) { if (tm->tm_year==102 && tm->tm_hour==2 && tm->tm_min==2 && tm->tm_sec==2)
{
splash(4*HZ, "Can't set time/date due to hardware issues!"); splash(4*HZ, "Can't set time/date due to hardware issues!");
pop_current_activity();
return 0; return 0;
} }
#endif #endif