Merge branch 'release/4.27/2.0.0' into develop

xsolla · May 22, 2024 · 2824ff1 · 2824ff1
2 parents 1aba4a0 + 8ad0fbd
commit 2824ff1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/Source/Demo/XsollaUIBuilder/Private/XsollaUIBuilderModule.cpp b/Source/Demo/XsollaUIBuilder/Private/XsollaUIBuilderModule.cpp
@@ -13,8 +13,7 @@ const FName FXsollaUIBuilderModule::ModuleName = "XsollaUIBuilder";
 void FXsollaUIBuilderModule::StartupModule()
 {
 	// Register settings
-	XsollaUIBuilderSettings = NewObject<UXsollaUIBuilderSettings>(GetTransientPackage(), "XsollaUIBuilderSettings", RF_Standalone);
-	XsollaUIBuilderSettings->AddToRoot();
+	XsollaUIBuilderSettings = GetMutableDefault<UXsollaUIBuilderSettings>();
 
 	if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
 	{
@@ -36,8 +35,11 @@ void FXsollaUIBuilderModule::ShutdownModule()
 
 	if (!GExitPurge)
 	{
-		// If we're in exit purge, this object has already been destroyed
-		XsollaUIBuilderSettings->RemoveFromRoot();
+		if (XsollaUIBuilderSettings->IsRooted())
+		{
+			// If we're in exit purge, this object has already been destroyed
+			XsollaUIBuilderSettings->RemoveFromRoot();
+		}
 	}
 	else
 	{

diff --git a/Source/XsollaLogin/Private/XsollaLoginLibrary.cpp b/Source/XsollaLogin/Private/XsollaLoginLibrary.cpp
@@ -15,6 +15,7 @@
 #include "XsollaSettings/Public/XsollaProjectSettings.h"
 #include "XsollaSettings/Public/XsollaSettingsModule.h"
 #include "TextureResource.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 UXsollaLoginLibrary::UXsollaLoginLibrary(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)

diff --git a/Source/XsollaLogin/Private/XsollaLoginSubsystem.cpp b/Source/XsollaLogin/Private/XsollaLoginSubsystem.cpp
@@ -24,6 +24,7 @@
 #include "XsollaUtilsDataModel.h"
 #include "XsollaLoginBrowserWrapper.h"
 #include "Misc/EngineVersion.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 #if PLATFORM_ANDROID
 #include "Android/XsollaJavaConvertor.h"

diff --git a/Source/XsollaStore/Private/XsollaStoreSubsystem.cpp b/Source/XsollaStore/Private/XsollaStoreSubsystem.cpp
@@ -28,6 +28,8 @@
 #include "XsollaLoginLibrary.h"
 #include "Async/Async.h"
 #include "Kismet/GameplayStatics.h"
+#include "Runtime/Launch/Resources/Version.h"
+#include "Misc/EngineVersion.h"
 #if PLATFORM_ANDROID
 #include "XsollaLogin/Private/Android/XsollaJavaConvertor.h"
 #include "XsollaLogin/Private/Android/XsollaMethodCallUtils.h"

diff --git a/Source/XsollaUtils/Private/XsollaUtilsHttpRequestHelper.cpp b/Source/XsollaUtils/Private/XsollaUtilsHttpRequestHelper.cpp
@@ -7,6 +7,7 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Serialization/JsonReader.h"
 #include "Serialization/JsonSerializer.h"
+#include "Misc/EngineVersion.h"
 
 const FString XsollaUtilsHttpRequestHelper::NoResponseErrorMsg(TEXT("No response"));
 const FString XsollaUtilsHttpRequestHelper::UnknownErrorMsg(TEXT("Unknown error"));