Merge pull request #77 from Fayth/mantis-1993

Good catch, thanks!
vcmi · Jan 24, 2015 · 6120b2e · 6120b2e
2 parents 60932d9 + 72f34a7
commit 6120b2e
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/client/widgets/CGarrisonInt.cpp b/client/widgets/CGarrisonInt.cpp
@@ -239,17 +239,20 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
 				{
 					const CGHeroInstance *srcHero = commonInfo->src.AOH->getHero();
 					artSelected = true;
-					ArtifactLocation src(srcHero, commonInfo->src.slotID);
-					ArtifactLocation dst(myStack, ArtifactPosition::CREATURE_SLOT);
-					if (art->canBePutAt(dst, true))
-					{	//equip clicked stack
-						if(dst.getArt())
-						{
-							//creature can wear only one active artifact
-							//if we are placing a new one, the old one will be returned to the hero's backpack
-							LOCPLINT->cb->swapArtifacts(dst, ArtifactLocation(srcHero, dst.getArt()->firstBackpackSlot(srcHero)));
+					if (myStack) // try dropping the artifact only if the slot isn't empty
+					{
+						ArtifactLocation src(srcHero, commonInfo->src.slotID);
+						ArtifactLocation dst(myStack, ArtifactPosition::CREATURE_SLOT);
+						if (art->canBePutAt(dst, true))
+						{	//equip clicked stack
+							if(dst.getArt())
+							{
+								//creature can wear only one active artifact
+								//if we are placing a new one, the old one will be returned to the hero's backpack
+								LOCPLINT->cb->swapArtifacts(dst, ArtifactLocation(srcHero, dst.getArt()->firstBackpackSlot(srcHero)));
+							}
+							LOCPLINT->cb->swapArtifacts(src, dst);
 						}
-						LOCPLINT->cb->swapArtifacts(src, dst);
 					}
 				}
 			}