Merge pull request #2202 from Capostrophic/icon

Fix enchanted item icon update
6 years ago · aa513bba29
parent 6c522a0875 2f38e4fbb3
commit aa513bba29
1 changed files with 12 additions and 5 deletions
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@ -156,12 +156,19 @@ namespace MWGui

    void SpellWidget::setSpellIcon(const std::string& icon)
    {
-        if (mFrame)
+        if (mFrame && !mCurrentFrame.empty())
+        {
+            mCurrentFrame.clear();
            mFrame->setImageTexture("");
+        }
+        if (mCurrentIcon != icon)
+        {
+            mCurrentIcon = icon;
            if (mItemShadow)
                mItemShadow->setImageTexture(icon);
            if (mItem)
                mItem->setImageTexture(icon);
        }
+    }

 }