From cd636f7e367cfb7fa2c348d00071301a480d62c3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 3 Nov 2015 15:54:23 +0300
Subject: Fix removing items from npc inventory (restore amount in player
 inventory)

---
 src/gui/widgets/itemcontainer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/gui/widgets/itemcontainer.cpp')

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 975b865d9..c9f5298b7 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -801,6 +801,7 @@ void ItemContainer::mouseReleased(MouseEvent &event)
         }
         else if (src == DRAGDROP_SOURCE_NPC)
         {
+            inventory = PlayerInfo::getInventory();
             if (dst == DRAGDROP_SOURCE_NPC)
             {
                 const Item *const item = mInventory->getItem(
@@ -808,6 +809,8 @@ void ItemContainer::mouseReleased(MouseEvent &event)
                 const int index = getSlotByXY(event.getX(), event.getY());
                 if (index == Inventory::NO_SLOT_INDEX)
                 {
+                    if (inventory)
+                        inventory->virtualRestore(item, 1);
                     mInventory->removeItemAt(dragDrop.getTag());
                     return;
                 }
@@ -830,13 +833,15 @@ void ItemContainer::mouseReleased(MouseEvent &event)
             }
             else
             {
-                inventory = PlayerInfo::getInventory();
                 if (inventory)
                 {
                     const Item *const item = inventory->getItem(
                         dragDrop.getTag());
                     if (item)
+                    {
+                        inventory->virtualRestore(item, 1);
                         mInventory->removeItemAt(dragDrop.getTag());
+                    }
                 }
                 return;
             }
-- 
cgit v1.2.3-60-g2f50