From cd2d38a6d9976035cd6fdb681444146d7902834e Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon.styhre@nw-soft.com>
Date: Fri, 14 Mar 2025 21:59:57 +0100
Subject: [PATCH] Fixed a crash on window deinit

---
 es-core/src/Window.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index fecf53107..e144d806d 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -218,12 +218,18 @@ void Window::deinit()
 
     mPostprocessedBackground.reset();
     mHelp.reset();
-    mHelpComponents->clear();
-    mHelpComponents = nullptr;
-    mClockComponents->clear();
-    mClockComponents = nullptr;
-    mSystemStatusComponents->clear();
-    mSystemStatusComponents = nullptr;
+    if (mHelpComponents != nullptr) {
+        mHelpComponents->clear();
+        mHelpComponents = nullptr;
+    }
+    if (mClockComponents != nullptr) {
+        mClockComponents->clear();
+        mClockComponents = nullptr;
+    }
+    if (mSystemStatusComponents != nullptr) {
+        mSystemStatusComponents->clear();
+        mSystemStatusComponents = nullptr;
+    }
 
     InputManager::getInstance().deinit();
     ResourceManager::getInstance().unloadAll();