From 4d4536a8ee914e791cd3072cc38d8fe75bbd9622 Mon Sep 17 00:00:00 2001
From: ChrisL <ChrisL@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 11 Apr 2008 18:04:29 +0000
Subject: [PATCH] Fixed an item duplication bug related to the item description
 window and unloading a weapon.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Interface Items.cpp | 14 ++++++++++----
 Tactical/Items.cpp           |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 0785257c..a0e1f80a 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -3407,8 +3407,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 			if(gpItemPointer == NULL)
 			{
 				//not holding anything
-				gTempObject.MoveThisObjectTo(gItemPointer);
-				gpItemPointer = &gItemPointer;
+				if(gTempObject.exists() == true)
+				{
+					gTempObject.MoveThisObjectTo(gItemPointer);
+					gpItemPointer = &gItemPointer;
+				}
 			}
 			else
 			{
@@ -3484,8 +3487,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 			if(gpItemPointer == NULL)
 			{
 				//not holding anything
-				gTempObject.MoveThisObjectTo(gItemPointer);
-				gpItemPointer = &gItemPointer;
+				if(gTempObject.exists() == true)
+				{
+					gTempObject.MoveThisObjectTo(gItemPointer);
+					gpItemPointer = &gItemPointer;
+				}
 			}
 			else
 			{
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 65158044..8b5b8d72 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -3167,6 +3167,8 @@ BOOLEAN EmptyWeaponMagazine( OBJECTTYPE * pWeapon, OBJECTTYPE *pAmmo, UINT32 sub
 	}
 	else
 	{
+		//CHRISL: Clear the contents of pAmmo just in case
+		pAmmo->initialize();
 		return( FALSE );
 	}
 }