diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-15 18:05:18 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-15 18:05:18 +0000 |
commit | 3e60fb410d4db6591c9e379e364c7061bd8db24d (patch) | |
tree | 0421c20f3318f83e869670a7215e66bb27d498ed /apps/gui | |
parent | f80a6ddeae7f27ff14adeb80990a1eefe1ce6c90 (diff) | |
download | rockbox-3e60fb410d4db6591c9e379e364c7061bd8db24d.tar.gz rockbox-3e60fb410d4db6591c9e379e364c7061bd8db24d.zip |
Consolidate some #ifdef code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23636 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/statusbar-skinned.c | 6 |
1 files changed, 1 insertions, 5 deletions
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) | |||
78 | static struct viewport inbuilt[NB_SCREENS]; | 78 | static struct viewport inbuilt[NB_SCREENS]; |
79 | struct viewport *sb_skin_get_info_vp(enum screen_type screen) | 79 | struct viewport *sb_skin_get_info_vp(enum screen_type screen) |
80 | { | 80 | { |
81 | int bar_setting = global_settings.statusbar; | 81 | int bar_setting = statusbar_position(screen); |
82 | #if NB_SCREENS > 1 | ||
83 | if (screen == SCREEN_REMOTE) | ||
84 | bar_setting = global_settings.remote_statusbar; | ||
85 | #endif | ||
86 | if (bar_setting == STATUSBAR_CUSTOM) | 82 | if (bar_setting == STATUSBAR_CUSTOM) |
87 | return &find_viewport(VP_INFO_LABEL, sb_skin[screen].data)->vp; | 83 | return &find_viewport(VP_INFO_LABEL, sb_skin[screen].data)->vp; |
88 | else if (bar_setting == STATUSBAR_OFF) | 84 | else if (bar_setting == STATUSBAR_OFF) |