From f356d0a2fce46edeb9fc1cef579dc931ab7989b3 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 10 Feb 2023 16:08:38 +0300
Subject: [PATCH] Check if the console's selected object is available (bug
 #5870)

---
 CHANGELOG.md                           | 1 +
 apps/openmw/mwgui/console.hpp          | 1 +
 apps/openmw/mwgui/windowmanagerimp.cpp | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd97e5e946..501b31dece 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     Bug #5371: Keyframe animation tracks are used for any file that begins with an X
     Bug #5714: Touch spells cast using ExplodeSpell don't always explode
     Bug #5849: Paralysis breaks landing
+    Bug #5870: Disposing of actors who were selected in the console doesn't deselect them like vanilla
     Bug #5883: Immobile creatures don't cause water ripples
     Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load
     Bug #6313: Followers with high Fight can turn hostile
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 306c7f63f1..aea5ed19ec 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -58,6 +58,7 @@ namespace MWGui
 
         void updateSelectedObjectPtr(const MWWorld::Ptr& currentPtr, const MWWorld::Ptr& newPtr);
 
+        void onFrame(float dt) override { checkReferenceAvailable(); }
         void clear() override;
 
         void resetReference() override;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index b313aba0f9..7f0c458bcb 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -895,6 +895,9 @@ namespace MWGui
 
         mDebugWindow->onFrame(frameDuration);
 
+        if (isConsoleMode())
+            mConsole->onFrame(frameDuration);
+
         if (!gameRunning)
             return;