Browse Source

Menu item index followup

Scott Lahteine 4 years ago
parent
commit
a8c361c93b
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      Marlin/src/lcd/menu/menu_filament.cpp

+ 2
- 2
Marlin/src/lcd/menu/menu_filament.cpp View File

86
 void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
86
 void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
87
   _change_filament_mode = mode;
87
   _change_filament_mode = mode;
88
   _change_filament_extruder = extruder;
88
   _change_filament_extruder = extruder;
89
+  const int8_t old_index = MenuItemBase::itemIndex;
89
   START_MENU();
90
   START_MENU();
90
   if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
91
   if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
91
   BACK_ITEM(MSG_BACK);
92
   BACK_ITEM(MSG_BACK);
92
   #if PREHEAT_COUNT
93
   #if PREHEAT_COUNT
93
-    const int8_t old_index = MenuItemBase::itemIndex;
94
     LOOP_L_N(m, PREHEAT_COUNT)
94
     LOOP_L_N(m, PREHEAT_COUNT)
95
       ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
95
       ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
96
-    MenuItemBase::itemIndex = old_index;
97
   #endif
96
   #endif
98
   EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target,
97
   EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target,
99
     EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT,
98
     EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT,
100
     _change_filament_with_custom
99
     _change_filament_with_custom
101
   );
100
   );
102
   END_MENU();
101
   END_MENU();
102
+  MenuItemBase::itemIndex = old_index;
103
 }
103
 }
104
 
104
 
105
 /**
105
 /**

Loading…
Cancel
Save