From 0c961dedc4898ba475872cdfbf5decbc658c14ce Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 7 Mar 2018 18:15:24 +0100 Subject: [PATCH] Reset menu stack in lcd_return_to_status(). Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure. --- Firmware/ultralcd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e212dae0..0fb581ae 100644 --- a/Firmware/ultralcd.cpp +++ b/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(); }