mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 04:06:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull in project-slippi/Ishiiruka/commit/a1d6240d9a5be61e71583d6d431b910199a7689c

Browse source
This commit is contained in:
Nikhil Narayana 2022-05-30 00:44:29 -07:00
commit a0535a494f
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Core/Slippi/SlippiMatchmaking.cpp
View file

@ -130,7 +130,7 @@ int SlippiMatchmaking::receiveMessage(json& msg, int timeoutMs)
netEvent.packet->data + netEvent.packet->dataLength); netEvent.packet->data + netEvent.packet->dataLength);
std::string str(buf.begin(), buf.end()); std::string str(buf.begin(), buf.end());
msg = json::parse(str); msg = json::parse(str, nullptr, false);
enet_packet_destroy(netEvent.packet); enet_packet_destroy(netEvent.packet);
return 0; return 0;

2
Source/Core/Core/Slippi/SlippiSpectate.cpp
View file

@ -192,7 +192,7 @@ void SlippiSpectateServer::handleMessage(u8* buffer, u32 length, u16 peer_id)
{ {
// Unpack the message // Unpack the message
std::string message((char*)buffer, length); 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())) if (!json_message.is_discarded() && (json_message.find("type") != json_message.end()))
{ {
// Check what type of message this is // Check what type of message this is

2
Source/Core/Core/Slippi/SlippiUser.cpp
View file

@ -348,7 +348,7 @@ void SlippiUser::overwriteFromServer()
} }
// Overwrite user info with data from server // 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.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.latest_version = r.value("latestVersion", m_user_info.latest_version);
m_user_info.display_name = r.value("displayName", m_user_info.display_name); m_user_info.display_name = r.value("displayName", m_user_info.display_name);