diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2022-12-30 09:45:05 +0100 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2022-12-30 10:35:50 -0500 |
commit | b321a719d314e30e7038fdd65792e46bcb3edba0 (patch) | |
tree | 98143ffc5d92b663c5f2184257ce61d56a377977 | |
parent | e180e45e01d257b753f97d7174e20f3e6a8a9378 (diff) | |
download | rockbox-b321a719d314e30e7038fdd65792e46bcb3edba0.tar.gz rockbox-b321a719d314e30e7038fdd65792e46bcb3edba0.zip |
option_select & time_menu : Fix unbalanced push/pop activity
Change-Id: Icabbabb16b2f173168a441af474ee8403b908dd4
-rw-r--r-- | apps/gui/option_select.c | 3 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index ca16b5b05f..8839f42e42 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -565,7 +565,10 @@ bool option_screen(const struct settings_list *setting, | |||
565 | function(*variable); | 565 | function(*variable); |
566 | } | 566 | } |
567 | else if(default_event_handler(action) == SYS_USB_CONNECTED) | 567 | else if(default_event_handler(action) == SYS_USB_CONNECTED) |
568 | { | ||
569 | pop_current_activity(); | ||
568 | return true; | 570 | return true; |
571 | } | ||
569 | /* callback */ | 572 | /* callback */ |
570 | if (function && !cb_on_select_only) | 573 | if (function && !cb_on_select_only) |
571 | function(*variable); | 574 | function(*variable); |
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index abf9c23cd0..6043573684 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -297,8 +297,10 @@ int time_screen(void* ignored) | |||
297 | because they always report "02:02:02" as time. | 297 | because they always report "02:02:02" as time. |
298 | */ | 298 | */ |
299 | struct tm *tm = get_time(); | 299 | struct tm *tm = get_time(); |
300 | if (tm->tm_year==102 && tm->tm_hour==2 && tm->tm_min==2 && tm->tm_sec==2) { | 300 | if (tm->tm_year==102 && tm->tm_hour==2 && tm->tm_min==2 && tm->tm_sec==2) |
301 | { | ||
301 | splash(4*HZ, "Can't set time/date due to hardware issues!"); | 302 | splash(4*HZ, "Can't set time/date due to hardware issues!"); |
303 | pop_current_activity(); | ||
302 | return 0; | 304 | return 0; |
303 | } | 305 | } |
304 | #endif | 306 | #endif |