Slightly change parts of the previous commit to reuse existing code, and enforce enum statusbar_values instead of just int,

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22485 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 8 deletions

diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 1a724406ef..7a361e58ed 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -827,13 +827,7 @@ void gui_statusbar_changed( enum screen_type screen,
                             enum statusbar_values old)
 {
     /* clear and update the statusbar area to remove old parts */
-    enum statusbar_values bar;
-#ifdef HAVE_REMOTE_LCD
-    if (screen == SCREEN_REMOTE)
-        bar = global_settings.remote_statusbar;
-    else
-#endif
-        bar = global_settings.statusbar;
+    enum statusbar_values bar = statusbar_position(screen);
 
     struct screen *display = &screens[screen];
     struct viewport vp;
@@ -850,7 +844,7 @@ void gui_statusbar_changed( enum screen_type screen,
 #endif
 
 #ifdef HAVE_REMOTE_LCD
-int statusbar_position(int screen)
+enum statusbar_values statusbar_position(int screen)
 {
     if (screen == SCREEN_REMOTE)
         return global_settings.remote_statusbar;