From de7fcf0beba837bd1ae9071516d23229bfb0cf72 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 31 May 2014 13:24:13 +0200
Subject: [PATCH] Fix unhandled edge case in TradeItemModel with items that are
 able to stack, but are not currently stacked (e.g. after repairing a damaged
 item)

Fixes #1368
---
 apps/openmw/mwgui/itemmodel.cpp      | 4 ++--
 apps/openmw/mwgui/tradeitemmodel.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 55317724e3..59b54e171d 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -100,7 +100,7 @@ namespace MWGui
         for (size_t i=0; i<mSourceModel->getItemCount(); ++i)
         {
             const ItemStack& item = mSourceModel->getItem(i);
-            if (item == itemToSearch)
+            if (item.mBase == itemToSearch.mBase)
                 return i;
         }
         return -1;
@@ -112,7 +112,7 @@ namespace MWGui
         for (size_t i=0; i<getItemCount(); ++i)
         {
             const ItemStack& item = getItem(i);
-            if (item == itemToSearch)
+            if (item.mBase == itemToSearch.mBase)
                 return i;
         }
         return -1;
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index fe43eb5483..5fdf604dac 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -35,7 +35,7 @@ namespace MWGui
         bool found = false;
         for (; it != out.end(); ++it)
         {
-            if (it->stacks(item))
+            if (it->mBase == item.mBase)
             {
                 it->mCount += item.mCount;
                 found = true;
@@ -52,7 +52,7 @@ namespace MWGui
         bool found = false;
         for (; it != out.end(); ++it)
         {
-            if (it->stacks(item))
+            if (it->mBase == item.mBase)
             {
                 if (it->mCount < count)
                     throw std::runtime_error("Not enough borrowed items to return");
@@ -114,7 +114,7 @@ namespace MWGui
             size_t i=0;
             for (; i<sourceModel->getItemCount(); ++i)
             {
-                if (it->stacks(sourceModel->getItem(i)))
+                if (it->mBase == sourceModel->getItem(i).mBase)
                     break;
             }
             if (i == sourceModel->getItemCount())
@@ -182,7 +182,7 @@ namespace MWGui
             std::vector<ItemStack>::iterator it = mBorrowedFromUs.begin();
             for (; it != mBorrowedFromUs.end(); ++it)
             {
-                if (it->stacks(item))
+                if (it->mBase == item.mBase)
                 {
                     if (item.mCount < it->mCount)
                         throw std::runtime_error("Lent more items than present");