From c7e1c0b595dd88c4fc61134a00bb3266ba156455 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Dec 2014 17:38:32 +0100
Subject: [PATCH] Fix weapon cycle getting stuck for same item IDs

---
 apps/openmw/mwgui/inventorywindow.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 4fbfc2c67a..d3c6073f47 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -615,13 +615,14 @@ namespace MWGui
 
     void InventoryWindow::cycle(bool next)
     {
-        ItemModel::ModelIndex selected = 0;
+        ItemModel::ModelIndex selected = -1;
         // not using mSortFilterModel as we only need sorting, not filtering
         SortFilterItemModel model(new InventoryItemModel(MWBase::Environment::get().getWorld()->getPlayerPtr()));
         model.setSortByType(false);
         model.update();
         if (model.getItemCount() == 0)
             return;
+
         for (ItemModel::ModelIndex i=0; i<int(model.getItemCount()); ++i)
         {
             MWWorld::Ptr item = model.getItem(i).mBase;
@@ -631,6 +632,9 @@ namespace MWGui
 
         int incr = next ? 1 : -1;
         bool found = false;
+        std::string lastId;
+        if (selected != -1)
+            lastId = model.getItem(selected).mBase.getCellRef().getRefId();
         ItemModel::ModelIndex cycled = selected;
         while (!found)
         {
@@ -638,11 +642,18 @@ namespace MWGui
             cycled = (cycled + model.getItemCount()) % model.getItemCount();
 
             MWWorld::Ptr item = model.getItem(cycled).mBase;
-            if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() && isRightHandWeapon(item))
-                found = true;
 
             if (cycled == selected) // we've been through all items, nothing found
                 return;
+
+            // skip different stacks of the same item, or we will get stuck as stacking/unstacking them may change their relative ordering
+            if (Misc::StringUtils::ciEqual(lastId, item.getCellRef().getRefId()))
+                continue;
+
+            lastId = item.getCellRef().getRefId();
+
+            if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() && isRightHandWeapon(item))
+                found = true;
         }
 
         useItem(model.getItem(cycled).mBase);