diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-scroll.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 895cf98cba..8ab91ef642 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -24,6 +24,8 @@ | |||
24 | /* This file is meant to be #included by scroll_engine.c (twice if a remote | 24 | /* This file is meant to be #included by scroll_engine.c (twice if a remote |
25 | * is present) */ | 25 | * is present) */ |
26 | 26 | ||
27 | #include "misc.h" | ||
28 | #include "settings.h" | ||
27 | #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ | 29 | #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ |
28 | #define LCDFN(fn) lcd_ ## fn | 30 | #define LCDFN(fn) lcd_ ## fn |
29 | #define LCDM(ma) LCD_ ## ma | 31 | #define LCDM(ma) LCD_ ## ma |
@@ -195,8 +197,14 @@ static void LCDFN(scroll_worker)(void) | |||
195 | s = &si->scroll[index]; | 197 | s = &si->scroll[index]; |
196 | 198 | ||
197 | /* check pause */ | 199 | /* check pause */ |
198 | if (TIME_BEFORE(current_tick, s->start_tick)) | 200 | if (TIME_BEFORE(current_tick, s->start_tick)) { |
199 | continue; | 201 | continue; |
202 | } | ||
203 | |||
204 | if (global_settings.disable_mainmenu_scrolling && get_current_activity() == ACTIVITY_MAINMENU) { | ||
205 | // No scrolling on the main menu if disabled (to not break themes with lockscreens) | ||
206 | continue; | ||
207 | } | ||
200 | 208 | ||
201 | s->start_tick = current_tick; | 209 | s->start_tick = current_tick; |
202 | 210 | ||