From a0535a494f73498aad1a262be8aee385b2615b5d Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 30 May 2022 00:44:29 -0700 Subject: [PATCH] pull in project-slippi/Ishiiruka/commit/a1d6240d9a5be61e71583d6d431b910199a7689c --- Source/Core/Core/Slippi/SlippiMatchmaking.cpp | 2 +- Source/Core/Core/Slippi/SlippiSpectate.cpp | 2 +- Source/Core/Core/Slippi/SlippiUser.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp index f8f2a6dd3f..8f06f2e1e6 100644 --- a/Source/Core/Core/Slippi/SlippiMatchmaking.cpp +++ b/Source/Core/Core/Slippi/SlippiMatchmaking.cpp @@ -130,7 +130,7 @@ int SlippiMatchmaking::receiveMessage(json& msg, int timeoutMs) netEvent.packet->data + netEvent.packet->dataLength); std::string str(buf.begin(), buf.end()); - msg = json::parse(str); + msg = json::parse(str, nullptr, false); enet_packet_destroy(netEvent.packet); return 0; diff --git a/Source/Core/Core/Slippi/SlippiSpectate.cpp b/Source/Core/Core/Slippi/SlippiSpectate.cpp index aa092be7c1..45831549e6 100644 --- a/Source/Core/Core/Slippi/SlippiSpectate.cpp +++ b/Source/Core/Core/Slippi/SlippiSpectate.cpp @@ -192,7 +192,7 @@ void SlippiSpectateServer::handleMessage(u8* buffer, u32 length, u16 peer_id) { // Unpack the message std::string message((char*)buffer, length); - json json_message = json::parse(message); + json json_message = json::parse(message, nullptr, false); if (!json_message.is_discarded() && (json_message.find("type") != json_message.end())) { // Check what type of message this is diff --git a/Source/Core/Core/Slippi/SlippiUser.cpp b/Source/Core/Core/Slippi/SlippiUser.cpp index b700e9c188..e55f3dbad1 100644 --- a/Source/Core/Core/Slippi/SlippiUser.cpp +++ b/Source/Core/Core/Slippi/SlippiUser.cpp @@ -348,7 +348,7 @@ void SlippiUser::overwriteFromServer() } // Overwrite user info with data from server - auto r = json::parse(resp); + auto r = json::parse(resp, nullptr, false); m_user_info.connect_code = r.value("connectCode", m_user_info.connect_code); m_user_info.latest_version = r.value("latestVersion", m_user_info.latest_version); m_user_info.display_name = r.value("displayName", m_user_info.display_name);