From fa20d0c079dd74675d73bdfc57775c1d81cb3121 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 1 Aug 2011 20:41:58 +0000
Subject: [PATCH] BUGZILLA #557: Fixed CTD when entering Estoni I6 (fix by
 TheBob)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Items.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index ba712431..f957585b 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -6295,12 +6295,17 @@ BOOLEAN AutoPlaceObjectToWorld(SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj, INT8 b
 
 	if( guiCurrentScreen == MAP_SCREEN )
 	{
-		if(fShowMapInventoryPool && !IsMercInActiveSector(pSoldier) )
-		{
-			fShowMapInventoryPool = FALSE;
-			CreateDestroyMapInventoryPoolButtons(FALSE);
+		// the_bob : added the check for whether pSoldier actually points to something to handle calling this function with pSoldier = NULL
+		if (pSoldier){
+			if(fShowMapInventoryPool && !IsMercInActiveSector(pSoldier) )
+			{
+				fShowMapInventoryPool = FALSE;
+				CreateDestroyMapInventoryPoolButtons(FALSE);
+			}
+
+			 ChangeSelectedMapSector(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ);
 		}
-		ChangeSelectedMapSector(pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ);
+
 		if(!fShowMapInventoryPool)
 		{
 			fShowMapInventoryPool = TRUE;