From d000e8c1a3e3dbaac8b00e43f0585073d34d9e62 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 12 Aug 2016 17:51:21 +0000
Subject: [PATCH] Fix: invalid access to inventory

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

diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index 51fb8cf9e..f0cd9b970 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -1847,7 +1847,7 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bLevel, UINT16 usHa
 	if ( Item[ usHandItem ].ubCursor == INVALIDCURS )
 	{
 		// Found detonator...
-		if ( HasAttachmentOfClass( &(pSoldier->inv[ usHandItem ] ), (AC_DETONATOR | AC_REMOTEDET | AC_DEFUSE) ) || Item[ (&(pSoldier->inv[ usHandItem ] ))->usItem ].tripwire == 1 )
+		if ( HasAttachmentOfClass( &(pSoldier->inv[pSoldier->ubAttackingHand]), (AC_DETONATOR | AC_REMOTEDET | AC_DEFUSE) ) || Item[usHandItem].tripwire )
 		{
 			StartBombMessageBox( pSoldier, sGridNo );