forked from len0rd/rockbox
option_select & time_menu : Fix unbalanced push/pop activity
Change-Id: Icabbabb16b2f173168a441af474ee8403b908dd4
This commit is contained in:
parent
e180e45e01
commit
b321a719d3
2 changed files with 6 additions and 1 deletions
|
@ -565,7 +565,10 @@ bool option_screen(const struct settings_list *setting,
|
|||
function(*variable);
|
||||
}
|
||||
else if(default_event_handler(action) == SYS_USB_CONNECTED)
|
||||
{
|
||||
pop_current_activity();
|
||||
return true;
|
||||
}
|
||||
/* callback */
|
||||
if (function && !cb_on_select_only)
|
||||
function(*variable);
|
||||
|
|
|
@ -297,8 +297,10 @@ int time_screen(void* ignored)
|
|||
because they always report "02:02:02" as 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!");
|
||||
pop_current_activity();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue