From b9b4a0c530db82ea532abe51481f1a1edb0ef0ef Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 28 Jan 2016 02:39:55 +0100 Subject: [PATCH] gcadapter: set the konga setting properly if it was used in netplay, it would read memory out of bounds (due to the mapping method returning 4 if the device was remote) which was 0 more often than not, causing the device in this position to be a konga. (which may or not be the gcadapter due to the swap between local and ingame controllers) --- Source/Core/Core/HW/SI_DeviceGCAdapter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp index 339130405b..9d96fadc3e 100644 --- a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp @@ -16,7 +16,8 @@ CSIDevice_GCAdapter::CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber) { // get the correct pad number that should rumble locally when using netplay const u8 numPAD = NetPlay_InGamePadToLocalPad(ISIDevice::m_iDeviceNumber); - m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD]; + if (numPAD < 4) + m_simulate_konga = SConfig::GetInstance().m_AdapterKonga[numPAD]; } GCPadStatus CSIDevice_GCAdapter::GetPadStatus()