From 3e60fb410d4db6591c9e379e364c7061bd8db24d Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 15 Nov 2009 18:05:18 +0000 Subject: Consolidate some #ifdef code. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23636 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/statusbar-skinned.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'apps') diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index d53f465116..4ef739929a 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c @@ -78,11 +78,7 @@ void sb_skin_data_load(enum screen_type screen, const char *buf, bool isfile) static struct viewport inbuilt[NB_SCREENS]; struct viewport *sb_skin_get_info_vp(enum screen_type screen) { - int bar_setting = global_settings.statusbar; -#if NB_SCREENS > 1 - if (screen == SCREEN_REMOTE) - bar_setting = global_settings.remote_statusbar; -#endif + int bar_setting = statusbar_position(screen); if (bar_setting == STATUSBAR_CUSTOM) return &find_viewport(VP_INFO_LABEL, sb_skin[screen].data)->vp; else if (bar_setting == STATUSBAR_OFF) -- cgit v1.2.3