From 40f697cea64ee596f93e404a8cb08a1a14872837 Mon Sep 17 00:00:00 2001
From: JeffR <Areloch@gmail.com>
Date: Wed, 11 Mar 2026 02:22:17 -0500
Subject: [PATCH] Adds sanity checks when removing children to
 GuiPopUpMenuCtrlEx to prevent crashing on exit

---
 Engine/source/gui/controls/guiPopUpCtrlEx.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp
index e7bacb4f3..f064a7f09 100644
--- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp
+++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp
@@ -1651,10 +1651,17 @@ void GuiPopUpMenuCtrlEx::addChildren()
 
 void GuiPopUpMenuCtrlEx::removeChildren()
 {
-   mTl->deleteObject();
-   mSc->deleteObject();
-   mSearchEdit->deleteObject();
-   mBackground->deleteObject();
+   if (mTl && !mTl->isDeleted())
+      mTl->deleteObject();
+
+   if (mSc && !mSc->isDeleted())
+      mSc->deleteObject();
+
+   if (mSearchEdit && !mSearchEdit->isDeleted())
+      mSearchEdit->deleteObject();
+
+   if (mBackground && !mBackground->isDeleted())
+      mBackground->deleteObject();
 }
 
 //------------------------------------------------------------------------------