summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2005-12-09 01:11:14 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2005-12-09 01:11:14 +0000
commit53a56c159383ad608e9f76e49c164d10be850b69 (patch)
tree1fd102fddd5bda4286047ab56af23b6bf6cd5869 /apps/settings.c
parent8e44d4bdc7c5d3f8afe98ad70e1de533c9df9bbe (diff)
downloadrockbox-53a56c159383ad608e9f76e49c164d10be850b69.tar.gz
rockbox-53a56c159383ad608e9f76e49c164d10be850b69.zip
don't display the WPS after loading, it made rockbox crash with some WPS'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8209 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings.c b/apps/settings.c
index da17695120..22bfc9b60f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -923,7 +923,7 @@ void settings_apply(void)
923 global_settings.wps_file[0] != 0xff ) { 923 global_settings.wps_file[0] != 0xff ) {
924 snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", 924 snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
925 global_settings.wps_file); 925 global_settings.wps_file);
926 wps_data_load(gui_wps[0].data, buf, true, false); 926 wps_data_load(gui_wps[0].data, buf, true);
927 } 927 }
928 else 928 else
929 wps_data_init(gui_wps[0].data); 929 wps_data_init(gui_wps[0].data);
@@ -933,7 +933,7 @@ void settings_apply(void)
933 global_settings.rwps_file[0] != 0xff ) { 933 global_settings.rwps_file[0] != 0xff ) {
934 snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", 934 snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
935 global_settings.rwps_file); 935 global_settings.rwps_file);
936 wps_data_load(gui_wps[1].data, buf, true, false); 936 wps_data_load(gui_wps[1].data, buf, true);
937 } 937 }
938 else 938 else
939 wps_data_init(gui_wps[1].data); 939 wps_data_init(gui_wps[1].data);
@@ -1205,12 +1205,12 @@ bool settings_load_config(const char* file)
1205 1205
1206 /* check for the string values */ 1206 /* check for the string values */
1207 if (!strcasecmp(name, "wps")) { 1207 if (!strcasecmp(name, "wps")) {
1208 if (wps_data_load(gui_wps[0].data,value,true, false)) 1208 if (wps_data_load(gui_wps[0].data, value, true))
1209 set_file(value, (char *)global_settings.wps_file, MAX_FILENAME); 1209 set_file(value, (char *)global_settings.wps_file, MAX_FILENAME);
1210 } 1210 }
1211#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) 1211#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
1212 else if (!strcasecmp(name, "rwps")) { 1212 else if (!strcasecmp(name, "rwps")) {
1213 if (wps_data_load(gui_wps[1].data,value,true, false)) 1213 if (wps_data_load(gui_wps[1].data, value, true))
1214 set_file(value, (char *)global_settings.rwps_file, MAX_FILENAME); 1214 set_file(value, (char *)global_settings.rwps_file, MAX_FILENAME);
1215 } 1215 }
1216#endif 1216#endif