summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-02-22 05:16:11 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-02-22 05:16:11 +0000
commitf11fd781d4ab66c79d01a384053da5c59c433689 (patch)
tree82db390cfc660570cc2354e0063ee9a10b7d35e1 /apps/settings.c
parent31eda597200bccbfa47dbe05f3f3735590c83a13 (diff)
downloadrockbox-f11fd781d4ab66c79d01a384053da5c59c433689.zip
rockbox-f11fd781d4ab66c79d01a384053da5c59c433689.tar.gz
rockbox-f11fd781d4ab66c79d01a384053da5c59c433689.tar.bz2
rockbox-f11fd781d4ab66c79d01a384053da5c59c433689.tar.xz
fix typo of wps and sbs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24841 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 568e305..ec6f0af 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -754,17 +754,18 @@ void settings_apply_skins(void)
skin_font_init();
FOR_NB_SCREENS(i)
{
- const char* setting;
+ const char* setting = global_settings.sbs_file;
+ const char* suffix = ".sbs";
#ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE)
+ {
setting = global_settings.rsbs_file;
- else
+ suffix = ".rsbs";
+ }
#endif
- setting = global_settings.sbs_file;
if (setting[0] && setting[0] != '-')
{
- snprintf(buf, sizeof buf, SBS_DIR "/%s.%ssbs", setting,
- i == SCREEN_MAIN? "" : "r");
+ snprintf(buf, sizeof buf, SBS_DIR "/%s%s", setting, suffix);
sb_skin_data_load(i, buf, true);
}
else
@@ -776,14 +777,17 @@ void settings_apply_skins(void)
FOR_NB_SCREENS(i)
{
const char* setting = global_settings.wps_file;
+ const char* suffix = ".wps";
#ifdef HAVE_REMOTE_LCD
if (i == SCREEN_REMOTE)
- setting = global_settings.rsbs_file;
+ {
+ setting = global_settings.rwps_file;
+ suffix = ".rwps";
+ }
#endif
if (setting[0] && setting[0] != '-')
{
- snprintf(buf, sizeof buf, WPS_DIR "/%s.%swps", setting,
- i == SCREEN_MAIN? "" : "r");
+ snprintf(buf, sizeof buf, WPS_DIR "/%s%s", setting, suffix);
wps_data_load(SCREEN_MAIN, buf, true);
}
else