Merge pull request #7742 from jordan-woyak/si-device-change-fix

SI: Device change logic fix.
This commit is contained in:
Tilka
2019-02-03 00:52:23 +00:00
committed by GitHub
6 changed files with 67 additions and 65 deletions

View File

@@ -1566,21 +1566,21 @@ void NetPlayClient::UpdateDevices()
{
if (SerialInterface::SIDevice_IsGCController(SConfig::GetInstance().m_SIDevice[local_pad]))
{
SerialInterface::AddDevice(SConfig::GetInstance().m_SIDevice[local_pad], pad);
SerialInterface::ChangeDevice(SConfig::GetInstance().m_SIDevice[local_pad], pad);
}
else
{
SerialInterface::AddDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
SerialInterface::ChangeDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
}
local_pad++;
}
else if (player_id > 0)
{
SerialInterface::AddDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
SerialInterface::ChangeDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
}
else
{
SerialInterface::AddDevice(SerialInterface::SIDEVICE_NONE, pad);
SerialInterface::ChangeDevice(SerialInterface::SIDEVICE_NONE, pad);
}
pad++;
}