Menu item index followup

This commit is contained in:
Scott Lahteine 2020-12-27 23:49:15 -06:00
parent ed1c0b71df
commit 8aa453d75b

View file

@ -86,20 +86,20 @@ inline PGM_P change_filament_header(const PauseMode mode) {
void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) { void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
_change_filament_mode = mode; _change_filament_mode = mode;
_change_filament_extruder = extruder; _change_filament_extruder = extruder;
const int8_t old_index = MenuItemBase::itemIndex;
START_MENU(); START_MENU();
if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT); if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
BACK_ITEM(MSG_BACK); BACK_ITEM(MSG_BACK);
#if PREHEAT_COUNT #if PREHEAT_COUNT
const int8_t old_index = MenuItemBase::itemIndex;
LOOP_L_N(m, PREHEAT_COUNT) LOOP_L_N(m, PREHEAT_COUNT)
ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset); ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
MenuItemBase::itemIndex = old_index;
#endif #endif
EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target, EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target,
EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT,
_change_filament_with_custom _change_filament_with_custom
); );
END_MENU(); END_MENU();
MenuItemBase::itemIndex = old_index;
} }
/** /**