Fix #7925: Reset temporary saveload data at the start of loading a savegame instead of at the end.

Otherwise temporary data may be passed from an aborted load action to the next load action.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 0cba4b8d0..5336d247b 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -155,6 +155,11 @@ void MoveWaypointsToBaseStations()
 		UpdateWaypointOrder(&v->current_order);
 	}
 
+	ResetOldWaypoints();
+}
+
+void ResetOldWaypoints()
+{
 	_old_waypoints.clear();
 	_old_waypoints.shrink_to_fit();
 }
@@ -182,7 +187,7 @@ static const SaveLoad _old_waypoint_desc[] = {
 static void Load_WAYP()
 {
 	/* Precaution for when loading failed and it didn't get cleared */
-	_old_waypoints.clear();
+	ResetOldWaypoints();
 
 	int index;