From 1e0fd5cbfbf01d7ced075f4f12b180efab19fde2 Mon Sep 17 00:00:00 2001
From: EmiStorrs <emi@dataerrata.com>
Date: Thu, 12 Dec 2024 16:39:51 -0500
Subject: [PATCH] Check menu is valid before calling functions on it

---
 .../StevesUEHelpers/Private/StevesUI/MenuStack.cpp   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp b/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
index 93f45c0..a432e70 100644
--- a/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
+++ b/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
@@ -299,10 +299,14 @@ void UMenuStack::LastMenuClosed(bool bWasCancel)
 void UMenuStack::CloseAll(bool bWasCancel)
 {
     // We don't go through normal pop sequence, this is a shot circuit
-    for (int i = Menus.Num() - 1; i >= 0; --i)
-    {
-        Menus[i]->RemovedFromStack(this);
-    }
+	for (int i = Menus.Num() - 1; i >= 0; --i)
+	{
+		UMenuBase* Menu = Menus[i];
+		if (IsValid(Menu))
+		{
+			Menus[i]->RemovedFromStack(this);
+		}
+	}
     Menus.Empty();
     LastMenuClosed(bWasCancel);
 }