From 00e5f31242782af5681d56866dd414873b220194 Mon Sep 17 00:00:00 2001
From: Kindi <2538602-Kuyondo@users.noreply.gitlab.com>
Date: Tue, 11 Jul 2023 12:29:35 +0000
Subject: [PATCH] Finish draganddrop before startdrag

---
 CHANGELOG.md                          | 1 +
 apps/openmw/mwgui/inventorywindow.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d8b698060..1ff326d4ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,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
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 1ab37ace0e..2ef0406e3a 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/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();