Fixed Engine crashing because of bad world call

StudioSyndiCatCaius · Apr 21, 2023 · 62d6be0 · 62d6be0
1 parent 9b9dbbe
commit 62d6be0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/OmegaGameFramework/Source/OmegaGameFramework/Private/OmegaGameplaySubsystem.cpp b/OmegaGameFramework/Source/OmegaGameFramework/Private/OmegaGameplaySubsystem.cpp
@@ -298,15 +298,19 @@ void UGameplayPauseComponent::BeginDestroy()
 	if(GetSubsys())
 	{
 		GetSubsys()->PauseComps.Remove(this);
-		Super::BeginDestroy();
+
 	}
+	Super::BeginDestroy();
 }
 
 UOmegaGameplaySubsystem* UGameplayPauseComponent::GetSubsys()
 {
 	if(!SubsysRef)
 	{
-		SubsysRef = GetWorld()->GetSubsystem<UOmegaGameplaySubsystem>();
+		if(GetWorld())
+		{
+			SubsysRef = GetWorld()->GetSubsystem<UOmegaGameplaySubsystem>();
+		}
 	}
 	return  SubsysRef;
 }