Skip to content

Commit 9689578

Browse files
authored
2102 GDK QFE 1 (#556)
* 2102 GDK QFE1
1 parent 322fedf commit 9689578

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Source/Services/Multiplayer/Manager/multiplayer_lobby_client.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,10 @@ MultiplayerLobbyClient::DoWork()
606606
// than the join fails for the whole list of users.
607607
for (auto pendingRequest : processingQueue)
608608
{
609-
xuidsInOrder.push_back(pendingRequest->LocalUser()->Xuid());
609+
if (pendingRequest->LocalUser())
610+
{
611+
xuidsInOrder.push_back(pendingRequest->LocalUser()->Xuid());
612+
}
610613
}
611614
}
612615

Source/Services/Multiplayer/multiplayer_session_member.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,16 +705,17 @@ void MultiplayerSessionMember::SetExternalMemberPointer(XblMultiplayerSessionMem
705705
auto internalMember = Get(&member);
706706
internalMember->m_member = &member;
707707

708+
member.InitialTeam = internalMember->m_initialTeam.empty() ? nullptr : internalMember->m_initialTeam.data();
708709
member.CustomConstantsJson = internalMember->m_customConstantsJson.empty() ? nullptr :internalMember->m_customConstantsJson.data();
709710
member.SecureDeviceBaseAddress64 = internalMember->m_secureDeviceAddressBase64.empty() ? nullptr : internalMember->m_secureDeviceAddressBase64.data();
711+
member.Roles = internalMember->m_roles.empty() ? nullptr : internalMember->m_roles.data();
710712
member.CustomPropertiesJson = internalMember->m_customPropertiesString.empty() ? nullptr : internalMember->m_customPropertiesString.data();
711713
member.MatchmakingResultServerMeasurementsJson = internalMember->m_matchmakingResultServerMeasurementsJson.empty() ? nullptr : internalMember->m_matchmakingResultServerMeasurementsJson.data();
712714
member.ServerMeasurementsJson = internalMember->m_serverMeasurementsJson.empty() ? nullptr : internalMember->m_serverMeasurementsJson.data();
713715
member.MembersInGroupIds = internalMember->m_membersInGroupIds.empty() ? nullptr : internalMember->m_membersInGroupIds.data();
714716
member.QosMeasurementsJson = internalMember->m_qosMeasurementsJson.empty() ? nullptr : internalMember->m_qosMeasurementsJson.data();
715717
member.Groups = internalMember->m_groups.empty() ? nullptr : internalMember->m_groups.data();
716718
member.Encounters = internalMember->m_encounters.empty() ? nullptr : internalMember->m_encounters.data();
717-
member.Roles = internalMember->m_roles.empty() ? nullptr : internalMember->m_roles.data();
718719
}
719720

720721
NAMESPACE_MICROSOFT_XBOX_SERVICES_MULTIPLAYER_CPP_END

Source/Shared/build_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
//*********************************************************
1010
#pragma once
1111

12-
#define XBOX_SERVICES_API_VERSION_STRING "2021.02.20210204.0"
12+
#define XBOX_SERVICES_API_VERSION_STRING "2021.02.20210301.1"

0 commit comments

Comments
 (0)