From 9e84dc989e8eb709f4aee637a5f03ed74bec0152 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 29 Feb 2012 00:57:48 +0000
Subject: [PATCH] MERGED bugfixes from revision: 4966 - Nullpointer check-fix
 (by tazpn) o random null pointer check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Editor/EditorMercs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp
index b56d45ff..3c003f01 100644
--- a/Editor/EditorMercs.cpp
+++ b/Editor/EditorMercs.cpp
@@ -1657,7 +1657,7 @@ void IndicateSelectedMerc( INT16 sID )
 		}
 	}
 	//if we made it this far, then we have a new merc cursor indicator to draw.
-	if( gpSelected->pSoldier )
+	if( gpSelected == NULL || gpSelected->pSoldier )
 		gsSelectedMercGridNo = gpSelected->pSoldier->sGridNo;
 	else
 	{