Skip to content

Commit 97a1240

Browse files
authored
2206 GDK QFE3 (#593)
* 2206 GDK QFE3
1 parent a4d82ba commit 97a1240

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Include/xsapi-c/privacy_c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ enum class XblPermissionDenyReason : uint32_t
363363
/// A privacy value for the requestor has a restriction that doesn't allow interaction with the target.
364364
/// For instance, a parental control only allows interaction with friends and the target isn't a friend.
365365
/// </summary>
366-
PrivacySettingsRestrictsTarget = 9,
366+
PrivacySettingRestrictsTarget = 9,
367367

368368
/// <summary>
369369
/// The target is a cross-network user, but cross-network privacy settings indicated only friends are allowed.
@@ -418,7 +418,7 @@ typedef struct XblPermissionDenyReasonDetails
418418
XblPrivilege restrictedPrivilege;
419419

420420
/// <summary>
421-
/// Active when the deny reason is XblPermissionDenyReason::PrivacySettingsRestrictsTarget.
421+
/// Active when the deny reason is XblPermissionDenyReason::PrivacySettingRestrictsTarget.
422422
/// Unknown otherwise.
423423
/// </summary>
424424
XblPrivacySetting restrictedPrivacySetting;

Include/xsapi-cpp/impl/privacy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ string_t permission_deny_reason::reason() const
2424
{ static_cast<uint32_t>(XblPermissionDenyReason::PrivilegeRestrictsTarget), _T("PrivilegeRestrictsTarget") },
2525
{ static_cast<uint32_t>(XblPermissionDenyReason::BlockListRestrictsTarget), _T("BlockListRestrictsTarget") },
2626
{ static_cast<uint32_t>(XblPermissionDenyReason::MuteListRestrictsTarget), _T("MuteListRestrictsTarget") },
27-
{ static_cast<uint32_t>(XblPermissionDenyReason::PrivacySettingsRestrictsTarget), _T("PrivacySettingsRestrictsTarget") }
27+
{ static_cast<uint32_t>(XblPermissionDenyReason::PrivacySettingRestrictsTarget), _T("PrivacySettingRestrictsTarget") }
2828
};
2929
return reasonsMap.at(static_cast<uint32_t>(m_reasonDetails.reason));
3030
}

Source/Services/Privacy/permission_check_result.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Result<PermissionCheckResult> PermissionCheckResult::Deserialize(
7878
result.restrictedPrivilege = XblPrivilegeValue(restrictedSetting.data());
7979
break;
8080
}
81-
case XblPermissionDenyReason::PrivacySettingsRestrictsTarget:
81+
case XblPermissionDenyReason::PrivacySettingRestrictsTarget:
8282
{
8383
result.restrictedPrivacySetting = EnumValue<XblPrivacySetting>(restrictedSetting.data());
8484
break;

Source/Services/RealTimeActivityManager/real_time_activity_connection.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,10 @@ void Connection::ConnectCompleteHandler(WebsocketResult result) noexcept
691691
}
692692
else
693693
{
694-
m_state = XblRealTimeActivityConnectionState::Disconnected;
694+
if (m_connectAttempt > 3)
695+
{
696+
m_state = XblRealTimeActivityConnectionState::Disconnected;
697+
}
695698
ScheduleConnect();
696699
}
697700

@@ -804,7 +807,6 @@ void Connection::DisconnectHandler(WebSocketCloseStatus status) noexcept
804807
serviceSub->status = ServiceSubscription::Status::Inactive;
805808
}
806809

807-
m_state = XblRealTimeActivityConnectionState::Disconnected;
808810
ScheduleConnect();
809811
lock.unlock();
810812

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 "2022.06.20220517.0"
12+
#define XBOX_SERVICES_API_VERSION_STRING "2022.06.20220822.3"

0 commit comments

Comments
 (0)