summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-07-11 01:18:22 +0200
committerGitHub <noreply@github.com>2018-07-11 01:18:22 +0200
commitbf4341f7623ab44743315f0c346ebfc8a9e8e960 (patch)
tree39f4c9de8cb9430f2039a6e004cbc78dc8033397 /Source/Core
parent42298f6d6d2974fa0eb334dfa2a734f5f03ea656 (diff)
parent39449da3048e14ff36b3c6ced5d9965e8f7ba814 (diff)
Merge pull request #7248 from Techjar/netplay-fix-spectator-deadlock
NetPlay: Don't update mappings on leave if player had no mappings
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/NetPlayServer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index bb903b5323..57875eea00 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -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;
}