diff options
author | frosch <frosch@openttd.org> | 2020-01-12 17:23:04 +0100 |
---|---|---|
committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2020-01-12 19:08:38 +0100 |
commit | a4be4514c9206355af120106e00c18eca8b5d75a (patch) | |
tree | 09b828bdb5e1164a2a797fe394e685b0aeba0d6e /src/saveload/labelmaps_sl.cpp | |
parent | 41163331aa882765e528c0e716f6e49cee2411cb (diff) | |
download | openttd-a4be4514c9206355af120106e00c18eca8b5d75a.tar.xz |
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.
Diffstat (limited to 'src/saveload/labelmaps_sl.cpp')
-rw-r--r-- | src/saveload/labelmaps_sl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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; |