From a4be4514c9206355af120106e00c18eca8b5d75a Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 12 Jan 2020 17:23:04 +0100
Subject: 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.

---
 src/saveload/labelmaps_sl.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/saveload/labelmaps_sl.cpp')

diff --git a/src/saveload/labelmaps_sl.cpp b/src/saveload/labelmaps_sl.cpp
index 472a32881..542b85b9f 100644
--- a/src/saveload/labelmaps_sl.cpp
+++ b/src/saveload/labelmaps_sl.cpp
@@ -12,6 +12,7 @@
 #include "../tunnelbridge_map.h"
 
 #include "saveload.h"
+#include "saveload_internal.h"
 
 #include "../safeguards.h"
 
@@ -79,6 +80,11 @@ void AfterLoadLabelMaps()
 		}
 	}
 
+	ResetLabelMaps();
+}
+
+void ResetLabelMaps()
+{
 	_railtype_list.clear();
 }
 
@@ -106,7 +112,7 @@ static void Save_RAIL()
 
 static void Load_RAIL()
 {
-	_railtype_list.clear();
+	ResetLabelMaps();
 
 	LabelObject lo;
 
-- 
cgit v1.2.3-54-g00ecf