From 0e94dca563f3f5981ee3fae9c2f4a93f3569f2ac Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 4 Jun 2023 21:38:08 +0100 Subject: [PATCH] Fix GetLinkGraphJobDesc for null saveload conv settings --- src/saveload/linkgraph_sl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/saveload/linkgraph_sl.cpp b/src/saveload/linkgraph_sl.cpp index dae5f47da4..77594c625c 100644 --- a/src/saveload/linkgraph_sl.cpp +++ b/src/saveload/linkgraph_sl.cpp @@ -71,9 +71,11 @@ SaveLoadTable GetLinkGraphJobDesc() while (desc != nullptr) { if (desc->name != nullptr && strncmp(desc->name, prefix, prefixlen) == 0) { SaveLoad sl = desc->save; - char *&address = reinterpret_cast(sl.address); - address -= offset_gamesettings; - address += offset_component; + if (GetVarMemType(sl.conv) != SLE_VAR_NULL) { + char *&address = reinterpret_cast(sl.address); + address -= offset_gamesettings; + address += offset_component; + } saveloads.push_back(sl); } desc = GetSettingDescription(++setting);