From 191ab410aa89d55fe98bdfab519ae7389c50a0d9 Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Thu, 27 Jun 2024 16:10:28 +0100
Subject: [PATCH] Guard against trying to take focus on shutdown

---
 Source/StevesUEHelpers/Private/StevesUI/FocusSystem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/StevesUEHelpers/Private/StevesUI/FocusSystem.cpp b/Source/StevesUEHelpers/Private/StevesUI/FocusSystem.cpp
index 3b8d339..86d5945 100644
--- a/Source/StevesUEHelpers/Private/StevesUI/FocusSystem.cpp
+++ b/Source/StevesUEHelpers/Private/StevesUI/FocusSystem.cpp
@@ -66,7 +66,8 @@ void FFocusSystem::FocusableWidgetDestructed(UFocusableUserWidget* Widget)
     if (Widget->HasFocusedDescendants())
     {
         auto Highest = GetHighestFocusPriority();
-        if (Highest.IsValid())
+        // Make sure player controller is valid too, this could be on shutdown
+        if (Highest.IsValid() && Highest->GetOwningPlayer())
         {
             UE_LOG(LogFocusSystem, Display, TEXT("Giving focus to %s"), *Highest->GetName());
             Highest->TakeFocusIfDesired();