From 11bcf8d3f898e53ec63a59e9e0e038a3308f0c69 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon.styhre@nw-soft.com>
Date: Fri, 14 Mar 2025 21:17:47 +0100
Subject: [PATCH] Improved the cleanup on window deinit

---
 es-core/src/Window.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 8d872bae9..fecf53107 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -217,6 +217,13 @@ void Window::deinit()
         (*it)->onHide();
 
     mPostprocessedBackground.reset();
+    mHelp.reset();
+    mHelpComponents->clear();
+    mHelpComponents = nullptr;
+    mClockComponents->clear();
+    mClockComponents = nullptr;
+    mSystemStatusComponents->clear();
+    mSystemStatusComponents = nullptr;
 
     InputManager::getInstance().deinit();
     ResourceManager::getInstance().unloadAll();
@@ -928,7 +935,7 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts)
             helpComponent->setPrompts(addPrompts);
         }
     }
-    else {
+    else if (mHelp != nullptr) {
         mHelp->setPrompts(addPrompts);
     }
 }