Merge branch 'fix#6451' into 'master'

Update spell hud first before weapon hud

Closes #6451

See merge request OpenMW/openmw!1447

CHANGELOG.md

@@ -82,7 +82,8 @@
     Bug #6416: Morphs are applied to the wrong target
     Bug #6417: OpenMW doesn't always use the right node to accumulate movement
     Bug #6429: Wyrmhaven: Can't add AI packages to player
-    Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened.
+    Bug #6433: Items bound to Quick Keys sometimes do not appear until the Quick Key menu is opened
+    Bug #6451: Weapon summoned from Cast When Used item will have the name "None"
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -289,13 +289,8 @@ namespace MWMechanics
         MWWorld::Ptr ptr = getPlayer();
         MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
 
-        // Update the equipped weapon icon
         MWWorld::InventoryStore& inv = ptr.getClass().getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-        if (weapon == inv.end())
-            winMgr->unsetSelectedWeapon();
-        else
-            winMgr->setSelectedWeapon(*weapon);
 
         // Update the selected spell icon
         MWWorld::ContainerStoreIterator enchantItem = inv.getSelectedEnchantItem();
@@ -310,6 +305,12 @@ namespace MWMechanics
                 winMgr->unsetSelectedSpell();
         }
 
+        // Update the equipped weapon icon
+        if (weapon == inv.end())
+            winMgr->unsetSelectedWeapon();
+        else
+            winMgr->setSelectedWeapon(*weapon);
+
         if (mUpdatePlayer)
         {
             mUpdatePlayer = false;