Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

[CHINF-886][MS] Fixing a crash caused by the merge into release related to the jira issue. #1864

Merged
merged 2 commits into from
Mar 4, 2020
Merged

[CHINF-886][MS] Fixing a crash caused by the merge into release related to the jira issue. #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e4fd5a
[CHINF-886][MS] Fixing a crash caused by the merge into release relat…
MatthewSandfordImprobable Mar 4, 2020
df29a14
Spelling mistake
MatthewSandfordImprobable Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SpatialGDK/Source/SpatialGDK/Private/EngineClasses/SpatialNetDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ void USpatialNetDriver::InitiateConnectionToSpatialOS(const FURL& URL)
}
}

Connection->Connect(bConnectAsClient);
#if WITH_EDITOR
Connection->Connect(bConnectAsClient, PlayInEditorID);
#else
Connection->Connect(bConnectAsClient, 0);
#endif
}

void USpatialNetDriver::OnConnectedToSpatialOS()
Expand Down
8 changes: 4 additions & 4 deletions SpatialGDK/Source/SpatialGDK/Private/Interop/Connection/SpatialWorkerConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void USpatialWorkerConnection::DestroyConnection()
KeepRunning.AtomicSet(true);
}

void USpatialWorkerConnection::Connect(bool bInitAsClient)
void USpatialWorkerConnection::Connect(bool bInitAsClient, uint32 PlayInEditorID)
{
if (bIsConnected)
{
Expand All @@ -88,7 +88,7 @@ void USpatialWorkerConnection::Connect(bool bInitAsClient)
switch (GetConnectionType())
{
case SpatialConnectionType::Receptionist:
ConnectToReceptionist(bInitAsClient);
ConnectToReceptionist(bInitAsClient, PlayInEditorID);
break;
case SpatialConnectionType::Locator:
ConnectToLocator();
Expand Down Expand Up @@ -191,7 +191,7 @@ void USpatialWorkerConnection::StartDevelopmentAuth(FString DevAuthToken)
}
}

void USpatialWorkerConnection::ConnectToReceptionist(bool bConnectAsClient)
void USpatialWorkerConnection::ConnectToReceptionist(bool bConnectAsClient, uint32 PlayInEditorID)
{
if (ReceptionistConfig.WorkerType.IsEmpty())
{
Expand All @@ -200,7 +200,7 @@ void USpatialWorkerConnection::ConnectToReceptionist(bool bConnectAsClient)
}

#if WITH_EDITOR
SpatialGDKServices::InitWorkers(bConnectAsClient, GetSpatialNetDriverChecked()->PlayInEditorID, ReceptionistConfig.WorkerId);
SpatialGDKServices::InitWorkers(bConnectAsClient, PlayInEditorID, ReceptionistConfig.WorkerId);
#endif

if (ReceptionistConfig.WorkerId.IsEmpty())
Expand Down
4 changes: 2 additions & 2 deletions SpatialGDK/Source/SpatialGDK/Public/Interop/Connection/SpatialWorkerConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SPATIALGDK_API USpatialWorkerConnection : public UObject, public FRunnable
/// @param Callback - callback function.
void RegisterOnLoginTokensCallback(const LoginTokenResponseCallback& Callback) {LoginTokenResCallback = Callback;}

void Connect(bool bConnectAsClient);
void Connect(bool bConnectAsClient, uint32 PlayInEditorID);

FORCEINLINE bool IsConnected() { return bIsConnected; }

Expand Down Expand Up @@ -74,7 +74,7 @@ class SPATIALGDK_API USpatialWorkerConnection : public UObject, public FRunnable
void RequestDeploymentLoginTokens();

private:
void ConnectToReceptionist(bool bConnectAsClient);
void ConnectToReceptionist(bool bConnectAsClient, uint32 PlayInEditorID);
void ConnectToLocator();
void FinishConnecting(Worker_ConnectionFuture* ConnectionFuture);

Expand Down