Fix bad navigation after rebase #189

Sebazzz · Sebazzz · commit 115fd2469b80 · 2021-02-18T00:23:43.000+01:00
diff --git a/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.cpp b/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.cpp
@@ -57,8 +57,6 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
             break;
     }
 
-    ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);
-
     // Load settings for axis
     axis_steps_mm = planner.settings.axis_steps_per_mm[current_axis];
     max_acceleration_mm_per_s2 = planner.settings.max_acceleration_mm_per_s2[current_axis];
@@ -135,7 +133,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
     #endif
 
     // Nav
-    ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_NAV);
+    ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);
 }
 
 void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)`
`57`	`57`	`break;`
`58`	`58`	`}`
`59`	`59`
`60`		`- ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);`
`61`		`-`
`62`	`60`	`// Load settings for axis`
`63`	`61`	`axis_steps_mm = planner.settings.axis_steps_per_mm[current_axis];`
`64`	`62`	`max_acceleration_mm_per_s2 = planner.settings.max_acceleration_mm_per_s2[current_axis];`
`@@ -135,7 +133,7 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)`
`135`	`133`	`#endif`
`136`	`134`
`137`	`135`	`// Nav`
`138`		`- ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_NAV);`
	`136`	`+ ScreenHandler.GotoScreen(DGUSLCD_SCREEN_AXIS_SETTINGS_AXIS);`
`139`	`137`	`}`
`140`	`138`
`141`	`139`	`void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {`