summaryrefslogtreecommitdiffstats
path: root/apps/screen_access.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/screen_access.c')
-rw-r--r--apps/screen_access.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index d0b483f3f4..5b2b4724f1 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -56,7 +56,7 @@ static int screen_helper_getnblines(void)
{
int height=screens[0].lcdheight;
#ifdef HAVE_LCD_BITMAP
- if(global_settings.statusbar)
+ if(global_settings.statusbar != STATUSBAR_OFF)
height -= STATUSBAR_HEIGHT;
#ifdef HAVE_BUTTONBAR
if(global_settings.buttonbar && screens[0].has_buttonbar)
@@ -89,10 +89,10 @@ static int screen_helper_remote_getnblines(void)
{
int height=screens[1].lcdheight;
#ifdef HAVE_LCD_BITMAP
- if(global_settings.statusbar)
+ if(global_settings.statusbar != STATUSBAR_OFF)
height -= STATUSBAR_HEIGHT;
#ifdef HAVE_BUTTONBAR
- if(global_settings.buttonbar && screens[0].has_buttonbar)
+ if(global_settings.buttonbar && screens[1].has_buttonbar)
height -= BUTTONBAR_HEIGHT;
#endif
#endif
@@ -286,6 +286,9 @@ struct screen screens[NB_SCREENS] =
.backdrop_load=&remote_backdrop_load,
.backdrop_unload=&remote_backdrop_unload,
.backdrop_show=&remote_backdrop_show,
+#ifdef HAVE_BUTTONBAR
+ .has_buttonbar=false,
+#endif
}
#endif /* HAVE_REMOTE_LCD */
};