From 8fe526b0e5f78a7ae80c76fc5a610dd7b0add048 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 19 Apr 2015 09:22:43 +0000
Subject: [PATCH] Fix: crash when entering a sector if currently selected merc
 is in the helicopter

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Overhead.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index 7701ce6c..e35a98a5 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -3180,7 +3180,12 @@ void InternalSelectSoldier( UINT16 usSoldierID, BOOLEAN fAcknowledge, BOOLEAN fF
     // find which squad this guy is, then set selected squad to this guy
 	if( pSoldier->bAssignment == VEHICLE )
 	{
-		SetCurrentSquad( GetSoldierStructureForVehicle(pSoldier->iVehicleId)->bAssignment, FALSE );	
+		SOLDIERTYPE* pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
+
+		if ( pVehicle )
+			SetCurrentSquad( pVehicle->bAssignment, FALSE );
+		else
+			SetCurrentSquad( pSoldier->bAssignment, FALSE );
 	}
 	else
 	{