0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Return to status when SD card is removed

Browse source
This commit is contained in:
Scott Lahteine 2019-01-08 23:08:20 -06:00
parent 5f2d75f45b
commit e6484d9dab
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/menu/menu_sdcard.cpp
View file

@ -114,7 +114,7 @@ void menu_sdcard() {
else if (card.flag.cardOK) else if (card.flag.cardOK)
MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir); MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
for (uint16_t i = 0; i < fileCnt; i++) { if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {
if (_menuLineNr == _thisItemNr) { if (_menuLineNr == _thisItemNr) {
const uint16_t nr = const uint16_t nr =
#if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA) #if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)

5
Marlin/src/lcd/ultralcd.cpp
View file

@ -709,7 +709,10 @@ void MarlinUI::update() {
} }
else { else {
card.release(); card.release();
if (old_sd_status != 2) set_status_P(PSTR(MSG_SD_REMOVED)); if (old_sd_status != 2) {
set_status_P(PSTR(MSG_SD_REMOVED));
if (!on_status_screen()) return_to_status();
}
} }
refresh(); refresh();