summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2005-12-04 12:11:08 +0000
committerMagnus Holmgren <magnushol@gmail.com>2005-12-04 12:11:08 +0000
commitf9fa33f6911e15a033687184057b5867da43a965 (patch)
treefd158e19077860a44addba4877165f7184675712
parent2afe1f550c34f171893836a80723f787f4763512 (diff)
downloadrockbox-f9fa33f6911e15a033687184057b5867da43a965.zip
rockbox-f9fa33f6911e15a033687184057b5867da43a965.tar.gz
rockbox-f9fa33f6911e15a033687184057b5867da43a965.tar.bz2
rockbox-f9fa33f6911e15a033687184057b5867da43a965.tar.xz
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.c2
-rw-r--r--apps/settings.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index 0a2c855..708c135 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -388,7 +388,7 @@ int ft_enter(struct tree_context* c)
MAX_FILENAME);
break;
-#ifdef HAVE_REMOTE_LCD
+#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
/* remote-wps config file */
case TREE_ATTR_RWPS:
wps_data_load(gui_wps[1].data, buf, true, true);
diff --git a/apps/settings.c b/apps/settings.c
index 516518d..49423ab 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -920,7 +920,7 @@ void settings_apply(void)
else
wps_data_init(gui_wps[0].data);
-#ifdef HAVE_REMOTE_LCD
+#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
if ( global_settings.rwps_file[0] &&
global_settings.rwps_file[0] != 0xff ) {
snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
@@ -1194,7 +1194,7 @@ bool settings_load_config(const char* file)
if (wps_data_load(gui_wps[0].data,value,true, false))
set_file(value, global_settings.wps_file, MAX_FILENAME);
}
-#ifdef HAVE_REMOTE_LCD
+#if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
else if (!strcasecmp(name, "rwps")) {
if (wps_data_load(gui_wps[1].data,value,true, false))
set_file(value, global_settings.rwps_file, MAX_FILENAME);