From 64218a7f5b9311185e95c5cb2e646cb235f0d2a7 Mon Sep 17 00:00:00 2001
From: mordentral <morden@noxhub.net>
Date: Tue, 31 Oct 2017 10:03:43 -0400
Subject: [PATCH] Fixing a missing IsValid check in FindSessions

Former-commit-id: c4e3fc15f93f71fe8256be447da02af75cfc72c2
---
 .../Private/FindSessionsCallbackProxyAdvanced.cpp        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp
index 226ace8..3caa24d 100644
--- a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp
@@ -225,13 +225,20 @@ void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess)
 		}
 	}
 
-	if (bRunSecondSearch && ServerSearchType == EBPServerPresenceSearchType::AllServers)
+	if (Helper.IsValid() && bRunSecondSearch && ServerSearchType == EBPServerPresenceSearchType::AllServers)
 	{
 		bRunSecondSearch = false;
 		bIsOnSecondSearch = true;
 		auto Sessions = Helper.OnlineSub->GetSessionInterface();
 		Sessions->FindSessions(*Helper.UserID, SearchObjectDedicated.ToSharedRef());
 	}
+	else // We lost our player controller
+	{
+		if (bSuccess && SessionSearchResults.Num() > 0)
+			OnSuccess.Broadcast(SessionSearchResults);
+		else
+			OnFailure.Broadcast(SessionSearchResults);
+	}
 }