diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2006-10-11 08:58:23 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2006-10-11 08:58:23 +0000 |
commit | ec79219f012ba64617510ac7ba822d1b8b0f0c26 (patch) | |
tree | 8ef89494d4c78e7a5f99e36448904492b7a02635 /apps/settings.c | |
parent | bba9de2368047bae36c11295dc1e4cfe2715ce95 (diff) | |
download | rockbox-ec79219f012ba64617510ac7ba822d1b8b0f0c26.tar.gz rockbox-ec79219f012ba64617510ac7ba822d1b8b0f0c26.zip |
Don't load wps data twice when loading from cfg file. Gives a noticable speedup when loading themes with lots of images.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11184 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c index 2e64042141..da7ecb461d 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -1561,13 +1561,19 @@ bool settings_load_config(const char* file) | |||
1561 | #ifdef HAVE_LCD_COLOR | 1561 | #ifdef HAVE_LCD_COLOR |
1562 | unload_wps_backdrop(); | 1562 | unload_wps_backdrop(); |
1563 | #endif | 1563 | #endif |
1564 | if (wps_data_load(gui_wps[0].data, value, true)) | 1564 | int fd2; |
1565 | if ((fd2 = open(value, O_RDONLY)) >= 0) { | ||
1566 | close(fd2); | ||
1565 | set_file(value, (char *)global_settings.wps_file, MAX_FILENAME); | 1567 | set_file(value, (char *)global_settings.wps_file, MAX_FILENAME); |
1568 | } | ||
1566 | } | 1569 | } |
1567 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 1570 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
1568 | else if (!strcasecmp(name, "rwps")) { | 1571 | else if (!strcasecmp(name, "rwps")) { |
1569 | if (wps_data_load(gui_wps[1].data, value, true)) | 1572 | int fd2; |
1573 | if ((fd2 = open(value, O_RDONLY)) >= 0) { | ||
1574 | close(fd2); | ||
1570 | set_file(value, (char *)global_settings.rwps_file, MAX_FILENAME); | 1575 | set_file(value, (char *)global_settings.rwps_file, MAX_FILENAME); |
1576 | } | ||
1571 | } | 1577 | } |
1572 | #endif | 1578 | #endif |
1573 | else if (!strcasecmp(name, "lang")) { | 1579 | else if (!strcasecmp(name, "lang")) { |