Merge pull request #197 from immutable/dx-3654

ImmutableJeffrey · web-flow · commit 31ce0f28ad20 · 2025-03-18T18:24:11.000+10:00
Fix warning coming from trying to load passport settings save game when the save game doesn't exist
diff --git a/Source/Immutable/Private/Immutable/ImmutablePassport.cpp b/Source/Immutable/Private/Immutable/ImmutablePassport.cpp
@@ -657,11 +657,12 @@ void UImmutablePassport::SavePassportSettings()
 
 void UImmutablePassport::LoadPassportSettings()
 {
-	UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0));
-	
-	if (SaveGameInstance)
+	if (UGameplayStatics::DoesSaveGameExist(PASSPORT_SAVE_GAME_SLOT_NAME, 0))
 	{
-		SaveGameInstance->bWasConnectedViaPKCEFlow ? SetStateFlags(IPS_PKCE) : ResetStateFlags(IPS_PKCE);
+		if (const UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0)))
+		{
+			SaveGameInstance->bWasConnectedViaPKCEFlow ? SetStateFlags(IPS_PKCE) : ResetStateFlags(IPS_PKCE);
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -657,11 +657,12 @@ void UImmutablePassport::SavePassportSettings()`
`657`	`657`
`658`	`658`	`void UImmutablePassport::LoadPassportSettings()`
`659`	`659`	`{`
`660`		`- UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0));`
`661`		`-`
`662`		`- if (SaveGameInstance)`
	`660`	`+ if (UGameplayStatics::DoesSaveGameExist(PASSPORT_SAVE_GAME_SLOT_NAME, 0))`
`663`	`661`	`{`
`664`		`- SaveGameInstance->bWasConnectedViaPKCEFlow ? SetStateFlags(IPS_PKCE) : ResetStateFlags(IPS_PKCE);`
	`662`	`+ if (const UImmutableSaveGame* SaveGameInstance = Cast<UImmutableSaveGame>(UGameplayStatics::LoadGameFromSlot(PASSPORT_SAVE_GAME_SLOT_NAME, 0)))`
	`663`	`+ {`
	`664`	`+ SaveGameInstance->bWasConnectedViaPKCEFlow ? SetStateFlags(IPS_PKCE) : ResetStateFlags(IPS_PKCE);`
	`665`	`+ }`
`665`	`666`	`}`
`666`	`667`	`}`
`667`	`668`