From ae6dca77e5f4028bb07b82ec5cf2e6a27d488a26 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 26 Feb 2011 17:56:51 +0000
Subject: [PATCH] (svn r22146) -Fix: don't run savegame conversion during
 SlNullPointers; the pointer might not be converted or be NULL at that point

---
 src/saveload/saveload.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 4b7e3845a8..25c1fe9583 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -450,6 +450,11 @@ static void SlNullPointers()
 {
 	_sl.action = SLA_NULL;
 
+	/* We don't want any savegame conversion code to run
+	 * during NULLing; especially those that try to get
+	 * pointers from other pools. */
+	_sl_version = SAVEGAME_VERSION;
+
 	DEBUG(sl, 1, "Nulling pointers");
 
 	FOR_ALL_CHUNK_HANDLERS(ch) {