diff options
| -rw-r--r-- | apps/settings.c | 20 | ||||
| -rw-r--r-- | apps/settings_list.c | 8 |
2 files changed, 16 insertions, 12 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 diff --git a/apps/settings_list.c b/apps/settings_list.c index c9a4fe3..fe1162e 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -199,7 +199,7 @@ static const char graphic_numeric[] = "graphic,numeric"; /* Default theme settings */ #define DEFAULT_WPSNAME "cabbiev2" -#define DEFAULT_SBS_NAME "-" +#define DEFAULT_SBSNAME "-" #ifdef HAVE_LCD_BITMAP @@ -1440,13 +1440,13 @@ const struct settings_list settings[] = { DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), #ifdef HAVE_LCD_BITMAP TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", - DEFAULT_SBS_NAME, SBS_DIR "/", ".sbs"), + DEFAULT_SBSNAME, SBS_DIR "/", ".sbs"), #endif #ifdef HAVE_REMOTE_LCD TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", - DEFAULT_SBS_NAME, WPS_DIR "/", ".rwps"), + DEFAULT_WPSNAME, WPS_DIR "/", ".rwps"), TEXT_SETTING(F_THEMESETTING,rsbs_file, "rsbs", - DEFAULT_WPSNAME, SBS_DIR "/", ".rsbs"), + DEFAULT_SBSNAME, SBS_DIR "/", ".rsbs"), #endif TEXT_SETTING(0,lang_file,"lang","-",LANG_DIR "/",".lng"), #if LCD_DEPTH > 1 |