From a6d2c2479f787a1b2f41598f96b6617bfef7b3dc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 6 Aug 2016 16:24:26 -0700 Subject: [PATCH] Minor cleanup of lcd_goto_screen calls --- Marlin/ultralcd.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b5795a7d59..faed9a718d 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -484,15 +484,15 @@ static void lcd_status_screen() { } if (current_click) { - lcd_goto_screen(lcd_main_menu, true); + #if ENABLED(FILAMENT_LCD_DISPLAY) + previous_lcd_status_ms = millis(); // get status message to show up for a while + #endif lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. #if ENABLED(LCD_PROGRESS_BAR) false #endif ); - #if ENABLED(FILAMENT_LCD_DISPLAY) - previous_lcd_status_ms = millis(); // get status message to show up for a while - #endif + lcd_goto_screen(lcd_main_menu, true); } #if ENABLED(ULTIPANEL_FEEDMULTIPLY) @@ -2091,7 +2091,6 @@ void kill_screen(const char* lcd_msg) { static void lcd_filament_change_resume_print() { filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT; - lcdDrawUpdate = 2; lcd_goto_screen(lcd_status_screen); }