diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2005-12-04 12:11:08 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2005-12-04 12:11:08 +0000 |
commit | f9fa33f6911e15a033687184057b5867da43a965 (patch) | |
tree | fd158e19077860a44addba4877165f7184675712 | |
parent | 2afe1f550c34f171893836a80723f787f4763512 (diff) | |
download | rockbox-f9fa33f6911e15a033687184057b5867da43a965.tar.gz rockbox-f9fa33f6911e15a033687184057b5867da43a965.zip |
iRiver: Make logf-enabled builds of the simulator work again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8142 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/filetree.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 0a2c855375..708c135be7 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -388,7 +388,7 @@ int ft_enter(struct tree_context* c) | |||
388 | MAX_FILENAME); | 388 | MAX_FILENAME); |
389 | break; | 389 | break; |
390 | 390 | ||
391 | #ifdef HAVE_REMOTE_LCD | 391 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
392 | /* remote-wps config file */ | 392 | /* remote-wps config file */ |
393 | case TREE_ATTR_RWPS: | 393 | case TREE_ATTR_RWPS: |
394 | wps_data_load(gui_wps[1].data, buf, true, true); | 394 | wps_data_load(gui_wps[1].data, buf, true, true); |
diff --git a/apps/settings.c b/apps/settings.c index 516518da24..49423ab629 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -920,7 +920,7 @@ void settings_apply(void) | |||
920 | else | 920 | else |
921 | wps_data_init(gui_wps[0].data); | 921 | wps_data_init(gui_wps[0].data); |
922 | 922 | ||
923 | #ifdef HAVE_REMOTE_LCD | 923 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
924 | if ( global_settings.rwps_file[0] && | 924 | if ( global_settings.rwps_file[0] && |
925 | global_settings.rwps_file[0] != 0xff ) { | 925 | global_settings.rwps_file[0] != 0xff ) { |
926 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", | 926 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", |
@@ -1194,7 +1194,7 @@ bool settings_load_config(const char* file) | |||
1194 | if (wps_data_load(gui_wps[0].data,value,true, false)) | 1194 | if (wps_data_load(gui_wps[0].data,value,true, false)) |
1195 | set_file(value, global_settings.wps_file, MAX_FILENAME); | 1195 | set_file(value, global_settings.wps_file, MAX_FILENAME); |
1196 | } | 1196 | } |
1197 | #ifdef HAVE_REMOTE_LCD | 1197 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
1198 | else if (!strcasecmp(name, "rwps")) { | 1198 | else if (!strcasecmp(name, "rwps")) { |
1199 | if (wps_data_load(gui_wps[1].data,value,true, false)) | 1199 | if (wps_data_load(gui_wps[1].data,value,true, false)) |
1200 | set_file(value, global_settings.rwps_file, MAX_FILENAME); | 1200 | set_file(value, global_settings.rwps_file, MAX_FILENAME); |