From 471ad3fb0f0f4b332057e3fa7ee277dc780abcc2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Jan 2016 17:10:23 +0100
Subject: [PATCH] Fix an error in restocking logic (Fixes #3131)

---
 apps/openmw/mwworld/containerstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index ab9fa4611..45390405e 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -529,10 +529,10 @@ void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MW
         {
             std::map<std::string, int>::iterator listInMap = allowedForReplace.find(itemOrList);
 
-            int restockNum = it->mCount;
+            int restockNum = std::abs(it->mCount);
             //If we know we must restock less, take it into account
             if(listInMap != allowedForReplace.end())
-                restockNum += listInMap->second;//We add, because list items have negative count
+                restockNum -= std::min(restockNum, listInMap->second);
             //restock
             addInitialItem(itemOrList, owner, restockNum, true);
         }