From 57b2091f954a466cc2bfcd83e00a5d34671978ea Mon Sep 17 00:00:00 2001
From: lorry li <lorry.li@epicgames.com>
Date: Fri, 14 Jun 2024 12:36:02 -0400
Subject: [PATCH] Resubmit 34096212: Include InstanceName in the adapter
 OnlineSubsystem name Enables adapter to work in PIE #rb jay.nakai,
 Michael.Kirzinger #tests Tried in editor with different type of game modes.

[CL 34375152 by lorry li in ue5-main branch]
---
 .../Source/Private/Online/OnlineServicesOSSAdapterModule.cpp   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Engine/Plugins/Online/OnlineServicesOSSAdapter/Source/Private/Online/OnlineServicesOSSAdapterModule.cpp b/Engine/Plugins/Online/OnlineServicesOSSAdapter/Source/Private/Online/OnlineServicesOSSAdapterModule.cpp
index 57550f009e3c..6de2c4fa9c18 100644
--- a/Engine/Plugins/Online/OnlineServicesOSSAdapter/Source/Private/Online/OnlineServicesOSSAdapterModule.cpp
+++ b/Engine/Plugins/Online/OnlineServicesOSSAdapter/Source/Private/Online/OnlineServicesOSSAdapterModule.cpp
@@ -61,7 +61,8 @@ public:
 	virtual ~FOnlineServicesFactoryOSSAdapter() {}
 	virtual TSharedPtr<IOnlineServices> Create(FName InInstanceName) override
 	{
-		IOnlineSubsystem* Subsystem = IOnlineSubsystem::Get(Config.OnlineSubsystem);
+		FName CombinedInstanceName = InInstanceName.IsNone() ? (/*NoSuffix*/Config.OnlineSubsystem) : FName(*FString::Printf(TEXT("%s:%s"), *Config.OnlineSubsystem.ToString(), *InInstanceName.ToString()));
+		IOnlineSubsystem* Subsystem = IOnlineSubsystem::Get(CombinedInstanceName);
 		if (Subsystem != nullptr)
 		{
 			return MakeShared<FOnlineServicesOSSAdapter>(Config.Service, Config.ConfigName, InInstanceName, Subsystem);