summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorAlexander Levin <al.le@rockbox.org>2011-01-02 22:44:15 +0000
committerAlexander Levin <al.le@rockbox.org>2011-01-02 22:44:15 +0000
commit0ce42df073468ab3b9f714350f8a745ea178f020 (patch)
tree96820693c5a7dfa10b6555970077a0a55977f509 /apps
parenta6b611a6d65bb18a66b5b89742ee714d56526007 (diff)
downloadrockbox-0ce42df073468ab3b9f714350f8a745ea178f020.zip
rockbox-0ce42df073468ab3b9f714350f8a745ea178f020.tar.gz
rockbox-0ce42df073468ab3b9f714350f8a745ea178f020.tar.bz2
rockbox-0ce42df073468ab3b9f714350f8a745ea178f020.tar.xz
Don't load the colours file if it's set to '' (partial fix for FS#11847)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28949 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 1e96c05..f01b599 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -927,7 +927,8 @@ void settings_apply(bool read_disk)
CHART("<icons_init");
#ifdef HAVE_LCD_COLOR
- if (global_settings.colors_file[0])
+ if (global_settings.colors_file[0]
+ && global_settings.colors_file[0] != '-')
{
CHART(">read_color_theme_file");
read_color_theme_file();