瀏覽代碼

Reset menu stack in lcd_return_to_status().

Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
Marek Bel 7 年之前
父節點
當前提交
0c961dedc4
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Firmware/ultralcd.cpp

+ 2 - 1
Firmware/ultralcd.cpp

@@ -525,7 +525,7 @@ static void lcd_status_screen()
 
   if (current_click && (lcd_commands_type != LCD_COMMAND_STOP_PRINT)) //click is aborted unless stop print finishes
   {
-    menuStack.reset();
+    menuStack.reset(); //redundant, as already done in lcd_return_to_status(), just to be sure
     menu_action_submenu(lcd_main_menu);
     lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
 #if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
@@ -1381,6 +1381,7 @@ static void lcd_return_to_status() {
   );
 
     lcd_goto_menu(lcd_status_screen, 0, false);
+    menuStack.reset();
 }