3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset menu stack in lcd_return_to_status().

Browse Source 
Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
This commit is contained in:
Marek Bel 2018-03-07 18:15:24 +01:00
parent 716098c434
commit 0c961dedc4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/ultralcd.cpp
View File

@ -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 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); menu_action_submenu(lcd_main_menu);
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) #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); lcd_goto_menu(lcd_status_screen, 0, false);
menuStack.reset();
} }