From 0baefab436b910c753329ad19d252ed75572ce9d Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Thu, 19 Nov 2020 15:05:46 +0000
Subject: [PATCH] Safety checks over PlayerController on shutdown in MenuStack

---
 Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp b/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
index a70f3f0..25126a1 100644
--- a/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
+++ b/Source/StevesUEHelpers/Private/StevesUI/MenuStack.cpp
@@ -68,7 +68,11 @@ void UMenuStack::SavePreviousInputMousePauseState()
 
 void UMenuStack::ApplyInputModeChange(EInputModeChange Change) const
 {
-    auto PC = GetOwningPlayer();    
+    auto PC = GetOwningPlayer();
+
+    if (!PC) // possible during shutdown
+        return;
+    
     switch (Change)
     {
     case EInputModeChange::DoNotChange:
@@ -91,6 +95,10 @@ void UMenuStack::ApplyInputModeChange(EInputModeChange Change) const
 void UMenuStack::ApplyMousePointerVisibility(EMousePointerVisibilityChange Change) const
 {
     auto PC = GetOwningPlayer();    
+
+    if (!PC) // possible during shutdown
+        return;
+    
     switch (Change)
     {
     case EMousePointerVisibilityChange::DoNotChange: