diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/statusbar.c | 10 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 2 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 8 | ||||
-rw-r--r-- | apps/settings.h | 4 |
4 files changed, 6 insertions, 18 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, | |||
827 | enum statusbar_values old) | 827 | enum statusbar_values old) |
828 | { | 828 | { |
829 | /* clear and update the statusbar area to remove old parts */ | 829 | /* clear and update the statusbar area to remove old parts */ |
830 | enum statusbar_values bar; | 830 | enum statusbar_values bar = statusbar_position(screen); |
831 | #ifdef HAVE_REMOTE_LCD | ||
832 | if (screen == SCREEN_REMOTE) | ||
833 | bar = global_settings.remote_statusbar; | ||
834 | else | ||
835 | #endif | ||
836 | bar = global_settings.statusbar; | ||
837 | 831 | ||
838 | struct screen *display = &screens[screen]; | 832 | struct screen *display = &screens[screen]; |
839 | struct viewport vp; | 833 | struct viewport vp; |
@@ -850,7 +844,7 @@ void gui_statusbar_changed( enum screen_type screen, | |||
850 | #endif | 844 | #endif |
851 | 845 | ||
852 | #ifdef HAVE_REMOTE_LCD | 846 | #ifdef HAVE_REMOTE_LCD |
853 | int statusbar_position(int screen) | 847 | enum statusbar_values statusbar_position(int screen) |
854 | { | 848 | { |
855 | if (screen == SCREEN_REMOTE) | 849 | if (screen == SCREEN_REMOTE) |
856 | return global_settings.remote_statusbar; | 850 | return global_settings.remote_statusbar; |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 169b76b15a..84d37858e2 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -107,7 +107,7 @@ void gui_statusbar_changed(enum screen_type screen, | |||
107 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) | 107 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) |
108 | #define statusbar_position(a) (global_settings.statusbar) | 108 | #define statusbar_position(a) (global_settings.statusbar) |
109 | #else | 109 | #else |
110 | int statusbar_position(int screen); | 110 | enum statusbar_values statusbar_position(int screen); |
111 | #endif | 111 | #endif |
112 | 112 | ||
113 | #endif /*_GUI_STATUSBAR_H_*/ | 113 | #endif /*_GUI_STATUSBAR_H_*/ |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 0b2769831e..04360d8251 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -319,13 +319,7 @@ static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item | |||
319 | switch (action) | 319 | switch (action) |
320 | { | 320 | { |
321 | case ACTION_ENTER_MENUITEM: | 321 | case ACTION_ENTER_MENUITEM: |
322 | #ifdef HAVE_REMOTE_LCD | 322 | old_bar[screen] = statusbar_position(screen); |
323 | if (screen == SCREEN_REMOTE) | ||
324 | old_bar[screen] = global_settings.remote_statusbar; | ||
325 | else | ||
326 | #endif | ||
327 | old_bar[screen] = global_settings.statusbar; | ||
328 | break; | ||
329 | case ACTION_EXIT_MENUITEM: | 323 | case ACTION_EXIT_MENUITEM: |
330 | gui_statusbar_changed(screen, old_bar[screen]); | 324 | gui_statusbar_changed(screen, old_bar[screen]); |
331 | send_event(GUI_EVENT_STATUSBAR_TOGGLE, NULL); | 325 | send_event(GUI_EVENT_STATUSBAR_TOGGLE, NULL); |
diff --git a/apps/settings.h b/apps/settings.h index 1365736ecf..bd28b99401 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -552,9 +552,9 @@ struct user_settings | |||
552 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ | 552 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ |
553 | int battery_display; /* how battery is displayed: 0=graphic, 1=percent */ | 553 | int battery_display; /* how battery is displayed: 0=graphic, 1=percent */ |
554 | bool show_icons; /* 0=hide 1=show */ | 554 | bool show_icons; /* 0=hide 1=show */ |
555 | int statusbar; /* STATUSBAR_* enum values */ | 555 | enum statusbar_values statusbar; /* STATUSBAR_* enum values */ |
556 | #ifdef HAVE_REMOTE_LCD | 556 | #ifdef HAVE_REMOTE_LCD |
557 | int remote_statusbar; | 557 | enum statusbar_values remote_statusbar; |
558 | #endif | 558 | #endif |
559 | 559 | ||
560 | #if CONFIG_KEYPAD == RECORDER_PAD | 560 | #if CONFIG_KEYPAD == RECORDER_PAD |