Browse Source

Minor cleanup of lcd_goto_screen calls

Scott Lahteine 8 years ago
parent
commit
a6d2c2479f
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      Marlin/ultralcd.cpp

+ 4
- 5
Marlin/ultralcd.cpp View File

@@ -484,15 +484,15 @@ static void lcd_status_screen() {
484 484
     }
485 485
 
486 486
     if (current_click) {
487
-      lcd_goto_screen(lcd_main_menu, true);
487
+      #if ENABLED(FILAMENT_LCD_DISPLAY)
488
+        previous_lcd_status_ms = millis();  // get status message to show up for a while
489
+      #endif
488 490
       lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
489 491
         #if ENABLED(LCD_PROGRESS_BAR)
490 492
           false
491 493
         #endif
492 494
       );
493
-      #if ENABLED(FILAMENT_LCD_DISPLAY)
494
-        previous_lcd_status_ms = millis();  // get status message to show up for a while
495
-      #endif
495
+      lcd_goto_screen(lcd_main_menu, true);
496 496
     }
497 497
 
498 498
     #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
@@ -2091,7 +2091,6 @@ void kill_screen(const char* lcd_msg) {
2091 2091
 
2092 2092
     static void lcd_filament_change_resume_print() {
2093 2093
       filament_change_menu_response = FILAMENT_CHANGE_RESPONSE_RESUME_PRINT;
2094
-      lcdDrawUpdate = 2;
2095 2094
       lcd_goto_screen(lcd_status_screen);
2096 2095
     }
2097 2096
 

Loading…
Cancel
Save