dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid data race on map size when clearing link graph jobs in InitializeGame

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-05-07 00:58:52 +01:00
parent 9900adae70
commit 011b3b8b8d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/misc.cpp
View File

@@ -69,6 +69,10 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
* related to the new game we're about to start/load. */ * related to the new game we're about to start/load. */
UnInitWindowSystem(); UnInitWindowSystem();
/* Clear link graph schedule and stop any link graph threads before
* changing the map size. This avoids data races on the map size variables. */
LinkGraphSchedule::Clear();
AllocateMap(size_x, size_y); AllocateMap(size_x, size_y);
ViewportMapClearTunnelCache(); ViewportMapClearTunnelCache();
@@ -102,7 +106,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
} }
UpdateCachedSnowLine(); UpdateCachedSnowLine();
LinkGraphSchedule::Clear();
ClearTraceRestrictMapping(); ClearTraceRestrictMapping();
ClearBridgeSimulatedSignalMapping(); ClearBridgeSimulatedSignalMapping();
ClearCargoPacketDeferredPayments(); ClearCargoPacketDeferredPayments();