summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2016-02-02 22:08:38 +0100
committermathieui <mathieui@mathieui.net>2016-02-25 22:58:21 +0100
commit4fe2886c2c115751e7040ade63493ce92fd73824 (patch)
tree14086c2b1ac074f477599e4ea3d5c2f89a6b48c3 /Source/Core
parent7b2c54ad939929f68c1eafd82b57d5f662735d48 (diff)
[netplay] Use the device only if it’s a gc controller or similar
(bad things could happen if we wire up the gba with netplay)
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/NetPlayClient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index f76b097aa1..13eb60f45e 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -765,10 +765,10 @@ void NetPlayClient::UpdateDevices()
// so they should be added first.
for (auto player_id : m_pad_map)
{
- // Use local controller types for local controllers
+ // Use local controller types for local controllers if they are compatible
if (player_id == m_local_player->pid)
{
- if (SConfig::GetInstance().m_SIDevice[local_pad] != SIDEVICE_NONE)
+ if (SIDevice_IsGCController(SConfig::GetInstance().m_SIDevice[local_pad]))
{
SerialInterface::AddDevice(SConfig::GetInstance().m_SIDevice[local_pad], local_pad);
}