From 161e042e2ac72c84280bdb7005190fc3b53b2cad Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 28 Aug 2021 11:06:47 +0200
Subject: [PATCH] Prevent iterator invalidation when cleaning up summons

---
 apps/openmw/mwgui/container.cpp       | 3 ++-
 apps/openmw/mwmechanics/summoning.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index df490943d2..de771051ef 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -277,8 +277,9 @@ namespace MWGui
                             auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
                             if(it != summons.end())
                             {
-                                MWMechanics::purgeSummonEffect(summoner, *it);
+                                auto summon = *it;
                                 summons.erase(it);
+                                MWMechanics::purgeSummonEffect(summoner, summon);
                                 break;
                             }
                         }
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 953db077fb..c1923d4337 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -125,8 +125,9 @@ namespace MWMechanics
             if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
-                purgeSummonEffect(summoner, *it);
+                auto summon = *it;
                 creatureMap.erase(it++);
+                purgeSummonEffect(summoner, summon);
             }
             else
                 ++it;