Merge branch 'finishdrag' into 'master'

Finish draganddrop before startdrag

See merge request OpenMW/openmw!3186

CHANGELOG.md

@@ -60,6 +60,7 @@
     Bug #7413: Generated wilderness cells don't spawn fish
     Bug #7415: Unbreakable lock discrepancies
     Bug #7428: AutoCalc flag is not used to calculate enchantment costs
+    Bug #7459: Icons get stacked on the cursor when picking up multiple items simultaneously
     Feature #3537: Shader-based water ripples
     Feature #5492: Let rain and snow collide with statics
     Feature #6447: Add LOD support to Object Paging

apps/openmw/mwgui/inventorywindow.cpp

@@ -762,6 +762,10 @@ namespace MWGui
         }
         if (i == mTradeModel->getItemCount())
             throw std::runtime_error("Added item not found");
+
+        if (mDragAndDrop->mIsOnDragAndDrop)
+            mDragAndDrop->finish();
+
         mDragAndDrop->startDrag(i, mSortModel, mTradeModel, mItemView, count);
 
         MWBase::Environment::get().getWindowManager()->updateSpellWindow();