3DPrinting/Marlin-Tevo-Tarantula
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse source
This commit is contained in:
Bob-the-Kuhn 2019-04-25 12:06:01 -05:00
commit 73726d56b3
154 changed files with 1156 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -101,10 +101,7 @@
}
void menu_abort_confirm() {
START_MENU();
MENU_BACK(MSG_MAIN);
MENU_ITEM(function, MSG_STOP_PRINT, lcd_abort_job);
END_MENU();
do_select_screen(PSTR(MSG_BUTTON_STOP), PSTR(MSG_BACK), lcd_abort_job, ui.goto_previous_screen, PSTR(MSG_STOP_PRINT), NULL, PSTR("?"));
}
#endif // MACHINE_CAN_STOP