mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 13:15:32 +00:00
Code Issues Releases Wiki Activity

Cycle infinite loop fix (Fixes #2421)

Browse source
This commit is contained in:
scrawl 2015-03-02 17:25:26 +01:00
parent 191c0104f6
commit 730138035d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -653,16 +653,13 @@ namespace MWGui
if (selected != -1)
lastId = model.getItem(selected).mBase.getCellRef().getRefId();
ItemModel::ModelIndex cycled = selected;
while (!found)
for (int i=0; i<model.getItemCount(); ++i)
{
cycled += incr;
cycled = (cycled + model.getItemCount()) % model.getItemCount();
MWWorld::Ptr item = model.getItem(cycled).mBase;
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;
@ -670,9 +667,15 @@ namespace MWGui
lastId = item.getCellRef().getRefId();
if (item.getClass().getTypeName() == typeid(ESM::Weapon).name() && isRightHandWeapon(item))
{
found = true;
break;
}
}
if (!found)
return;
useItem(model.getItem(cycled).mBase);
}