summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2015-03-07 18:27:01 +0000
committerfrosch <frosch@openttd.org>2015-03-07 18:27:01 +0000
commit780e5959331b39eda19868126af41398a904818b (patch)
treee2d592a1b2ec24af7ae1190c9ef970289b2e8e03 /src/saveload
parente77de936366fd4a0773386b8bdbe5bd6da354c89 (diff)
downloadopenttd-780e5959331b39eda19868126af41398a904818b.tar.xz
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/linkgraph_sl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/saveload/linkgraph_sl.cpp b/src/saveload/linkgraph_sl.cpp
index 20a3f4498..a65f4fc8a 100644
--- a/src/saveload/linkgraph_sl.cpp
+++ b/src/saveload/linkgraph_sl.cpp
@@ -220,7 +220,7 @@ static void Load_LGRJ()
*/
static void Load_LGRS()
{
- SlObject(LinkGraphSchedule::Instance(), GetLinkGraphScheduleDesc());
+ SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
/**
@@ -246,7 +246,7 @@ void AfterLoadLinkGraphs()
}
}
- LinkGraphSchedule::Instance()->SpawnAll();
+ LinkGraphSchedule::instance.SpawnAll();
}
/**
@@ -278,7 +278,7 @@ static void Save_LGRJ()
*/
static void Save_LGRS()
{
- SlObject(LinkGraphSchedule::Instance(), GetLinkGraphScheduleDesc());
+ SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
/**
@@ -286,7 +286,7 @@ static void Save_LGRS()
*/
static void Ptrs_LGRS()
{
- SlObject(LinkGraphSchedule::Instance(), GetLinkGraphScheduleDesc());
+ SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
}
extern const ChunkHandler _linkgraph_chunk_handlers[] = {