summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/filetypes.c2
-rw-r--r--apps/settings.c10
2 files changed, 5 insertions, 7 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 280cd8c4b4..0aebc7855b 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -257,6 +257,8 @@ void read_color_theme_file(void) {
for (i = 0; i < MAX_FILETYPES; i++) {
custom_colors[i] = -1;
}
+ if (!global_settings.colors_file[0] || global_settings.colors_file[0] == '-')
+ return;
snprintf(buffer, MAX_PATH, THEME_DIR "/%s.colours",
global_settings.colors_file);
fd = open(buffer, O_RDONLY);
diff --git a/apps/settings.c b/apps/settings.c
index 1a93a4de54..8b6db13234 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -931,13 +931,9 @@ void settings_apply(bool read_disk)
CHART("<icons_init");
#ifdef HAVE_LCD_COLOR
- if (global_settings.colors_file[0]
- && global_settings.colors_file[0] != '-')
- {
- CHART(">read_color_theme_file");
- read_color_theme_file();
- CHART("<read_color_theme_file");
- }
+ CHART(">read_color_theme_file");
+ read_color_theme_file();
+ CHART("<read_color_theme_file");
#endif
}
#ifdef HAVE_LCD_COLOR