diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2021-11-19 17:55:10 +0100 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-12-02 17:45:49 -0500 |
commit | 64192cdfa8c11c117567e19f80033a2c184db357 (patch) | |
tree | afef285cec1d1575e60c5bb319346b49a301c9e3 /apps/shortcuts.c | |
parent | 6325971451fc593006f3703353ef02db7c92ee1c (diff) | |
download | rockbox-64192cdfa8c11c117567e19f80033a2c184db357.tar.gz rockbox-64192cdfa8c11c117567e19f80033a2c184db357.zip |
Fix FS#13319
Change-Id: Ia995e2de51f5d8984dffa90b97d4babb98f21399
Diffstat (limited to 'apps/shortcuts.c')
-rw-r--r-- | apps/shortcuts.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 443183934b..3672178647 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c | |||
@@ -659,9 +659,16 @@ int do_shortcut_menu(void *ignored) | |||
659 | } | 659 | } |
660 | break; | 660 | break; |
661 | case SHORTCUT_SETTING: | 661 | case SHORTCUT_SETTING: |
662 | { | ||
663 | int old_sleeptimer_duration = global_settings.sleeptimer_duration; | ||
662 | do_setting_screen(sc->u.setting, | 664 | do_setting_screen(sc->u.setting, |
663 | sc->name[0] ? sc->name : P2STR(ID2P(sc->u.setting->lang_id)),NULL); | 665 | sc->name[0] ? sc->name : P2STR(ID2P(sc->u.setting->lang_id)),NULL); |
666 | |||
667 | if (old_sleeptimer_duration != global_settings.sleeptimer_duration && | ||
668 | get_sleep_timer()) | ||
669 | set_sleeptimer_duration(global_settings.sleeptimer_duration); | ||
664 | break; | 670 | break; |
671 | } | ||
665 | case SHORTCUT_DEBUGITEM: | 672 | case SHORTCUT_DEBUGITEM: |
666 | run_debug_screen(sc->u.path); | 673 | run_debug_screen(sc->u.path); |
667 | break; | 674 | break; |
@@ -683,7 +690,7 @@ int do_shortcut_menu(void *ignored) | |||
683 | { | 690 | { |
684 | char timer_buf[10]; | 691 | char timer_buf[10]; |
685 | set_sleeptimer_duration(sc->u.timedata.sleep_timeout); | 692 | set_sleeptimer_duration(sc->u.timedata.sleep_timeout); |
686 | splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), | 693 | splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), |
687 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), | 694 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), |
688 | sc->u.timedata.sleep_timeout, NULL)); | 695 | sc->u.timedata.sleep_timeout, NULL)); |
689 | } | 696 | } |