From 120b7dcd2fe5e964050b82f82bbddf68d20e8cff Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Tue, 12 Nov 2019 21:44:46 +0300
Subject: [PATCH] Clean up summoned creatures when corpses are disposed

---
 apps/openmw/mwgui/container.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 6a303dfba..f0e025a33 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -248,6 +248,12 @@ namespace MWGui
                         MWScript::InterpreterContext interpreterContext (&mPtr.getRefData().getLocals(), mPtr);
                         MWBase::Environment::get().getScriptManager()->run (script, interpreterContext);
                     }
+
+                    // Clean up summoned creatures as well
+                    std::map<MWMechanics::CreatureStats::SummonKey, int>& creatureMap = creatureStats.getSummonedCreatureMap();
+                    for (const auto& creature : creatureMap)
+                        MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mPtr, creature.second);
+                    creatureMap.clear();
                 }
 
                 MWBase::Environment::get().getWorld()->deleteObject(mPtr);