ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7248 from Techjar/netplay-fix-spectator-deadlock 

NetPlay: Don't update mappings on leave if player had no mappings
This commit is contained in:
spycrab 2018-07-11 01:18:22 +02:00 committed by GitHub
parent 42298f6d6d 39449da304
commit bf4341f762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/NetPlayServer.cpp
View File

@ -366,7 +366,7 @@ unsigned int NetPlayServer::OnConnect(ENetPeer* socket)
// called from ---NETPLAY--- thread
unsigned int NetPlayServer::OnDisconnect(const Client& player)
{
PlayerId pid = player.pid;
const PlayerId pid = player.pid;
if (m_is_running)
{
@ -405,18 +405,18 @@ unsigned int NetPlayServer::OnDisconnect(const Client& player)
if (mapping == pid)
{
mapping = -1;
UpdatePadMapping();
}
}
UpdatePadMapping();
for (PadMapping& mapping : m_wiimote_map)
{
if (mapping == pid)
{
mapping = -1;
UpdateWiimoteMapping();
}
}
UpdateWiimoteMapping();
return 0;
}