summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-03-05 23:11:48 +1100
committerskidau <skidau@gmail.com>2015-03-05 23:11:48 +1100
commite5277a5f49673afa854aa3fcd14919e9debd97a1 (patch)
tree772333bbe6aa1c1b869d334c70fd9b4557386383 /Source/Core
parentdee6a0498082a1f1ec8bc890a8c0f257f3a53b65 (diff)
Ignore invalid rumble data sent over Netplay to the GC Adapter
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/SI_GCAdapter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp
index 795054c61f..bae96a1ccf 100644
--- a/Source/Core/Core/HW/SI_GCAdapter.cpp
+++ b/Source/Core/Core/HW/SI_GCAdapter.cpp
@@ -376,7 +376,8 @@ void Output(int chan, u8 rumble_command)
if (SConfig::GetInstance().m_GameCubeAdapterThread)
{
libusb_interrupt_transfer(s_handle, s_endpoint_out, rumble, sizeof(rumble), &size, 16);
- if (size != 0x05)
+ // Netplay sends invalid data which results in size = 0x00. Ignore it.
+ if (size != 0x05 && size != 0x00)
{
INFO_LOG(SERIALINTERFACE, "error writing rumble (size: %d)", size);
Shutdown();