From 6c3b80f04c7c2cca26efb57cc9827a7a1d20fcda Mon Sep 17 00:00:00 2001
From: Hownaer <franzi.moos@googlemail.com>
Date: Thu, 28 Aug 2014 14:58:03 +0200
Subject: Fixed crashes and use std::swap.

---
 src/UI/SlotArea.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/UI')

diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 74173d087..88af257a0 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -1423,7 +1423,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
 		}
 		case caDblClick:
 		{
-			// DblClicked(a_Player, a_SlotNum);
+			DblClicked(a_Player, a_SlotNum);
 			return;
 		}
 		case caMiddleClick:
@@ -1470,8 +1470,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
 	{
 		if (!Slot.IsEmpty())
 		{
-			DraggingItem = Slot;
-			Slot.Empty();
+			std::swap(DraggingItem, Slot);
 		}
 	}
 	else if (Slot.IsEmpty())
@@ -1487,9 +1486,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
 	else if ((DraggingItem.m_ItemCount == 1) && !DraggingItem.IsEqual(Slot))
 	{
 		// Switch contents
-		cItem tmp(DraggingItem);
-		DraggingItem = Slot;
-		Slot = tmp;
+		std::swap(DraggingItem, Slot);
 	}
 
 	SetSlot(a_SlotNum, a_Player, Slot);
-- 
cgit v1.2.3