From 6d3ecef69f5a0d6beab8b93dd04e6c700b871af8 Mon Sep 17 00:00:00 2001 From: teru Date: Thu, 21 Jan 2010 12:14:18 +0000 Subject: [PATCH] mpegplayer: reset foreground/background color and clear display in case they are changed in menu. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24308 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/mpeg_settings.c | 6 ------ apps/plugins/mpegplayer/mpegplayer.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 9bf0c37a8..a6eb96c52 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -902,9 +902,6 @@ static int show_start_menu(uint32_t duration) } } - rb->lcd_clear_display(); - rb->lcd_update(); - return result; } @@ -962,9 +959,6 @@ int mpeg_menu(void) if (mpeg_menu_sysevent() != 0) result = MPEG_MENU_QUIT; - rb->lcd_clear_display(); - rb->lcd_update(); - return result; } diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 155c60176..31d4ef971 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -1486,6 +1486,10 @@ static void wvs_handle_phone_plug(bool inserted) static void button_loop(void) { rb->lcd_setfont(FONT_SYSFIXED); +#ifdef HAVE_LCD_COLOR + rb->lcd_set_foreground(LCD_WHITE); + rb->lcd_set_background(LCD_BLACK); +#endif rb->lcd_clear_display(); rb->lcd_update(); @@ -1583,6 +1587,8 @@ static void button_loop(void) rb->lcd_set_foreground(LCD_WHITE); rb->lcd_set_background(LCD_BLACK); #endif + rb->lcd_clear_display(); + rb->lcd_update(); switch (result) { -- 2.11.4.GIT