From c7750b287d5106b1f660393c6d2b9d058f8fbceb Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 28 Jan 2016 20:24:18 +0100 Subject: [PATCH] netplay: default the local pad to a gc controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit if the configured local pad is none, it will make dolphin behave incorrectly (due to the game expecting inputs from the device while it doesn’t exist). --- Source/Core/Core/NetPlayClient.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index de5e8a901a..f76b097aa1 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -768,7 +768,14 @@ void NetPlayClient::UpdateDevices() // Use local controller types for local controllers if (player_id == m_local_player->pid) { - SerialInterface::AddDevice(SConfig::GetInstance().m_SIDevice[local_pad], local_pad); + if (SConfig::GetInstance().m_SIDevice[local_pad] != SIDEVICE_NONE) + { + SerialInterface::AddDevice(SConfig::GetInstance().m_SIDevice[local_pad], local_pad); + } + else + { + SerialInterface::AddDevice(SIDEVICE_GC_CONTROLLER, local_pad); + } local_pad++; } }