From a126db6ea4e9e5ca418b5a49b8e3fae8fbbd8ab9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 5 Feb 2010 20:18:30 +0000 Subject: (svn r19021) -Fix [FS#3570]: don't NULL the pointers when saving the savegame on an error during saving; the savegame is still valid --- src/saveload/saveload.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/saveload') diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index d6b83a794..e41213556 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -199,7 +199,7 @@ static void NORETURN SlError(StringID string, const char *extra_msg = NULL) * the pointers are actually filled with indices, which means that * when we access them during cleaning the pool dereferences of * those indices will be made with segmentation faults as result. */ - SlNullPointers(); + if (_sl.action == SLA_LOAD || _sl.action == SLA_PTRS) SlNullPointers(); throw std::exception(); } -- cgit v1.2.3-54-g00ecf