summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2016-07-13 18:56:23 +1200
committerGitHub <noreply@github.com>2016-07-13 18:56:23 +1200
commit3f9a98ddf2a77aa9ec2ed3d987cdf7aca25901b9 (patch)
treeec9dab9fd7f4ff07c789df6da9f89f9ecbde88ee /Source/Core/InputCommon
parentebf10d38ddc7367a4debb9987c0ef7f6ff152a12 (diff)
parentce9622c42652c0207801b5c20702569802a07f91 (diff)
Merge pull request #3979 from JosJuice/use-g_want_determinism
Use g_want_determinism more
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/GCAdapter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index b86b0aa4c5..7c450d4288 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -453,9 +453,9 @@ void Input(int chan, GCPadStatus* pad)
pad->triggerLeft = controller_payload_copy[1 + (9 * chan) + 7];
pad->triggerRight = controller_payload_copy[1 + (9 * chan) + 8];
}
- else if (!NetPlay::IsNetPlayRunning())
+ else if (!Core::g_want_determinism)
{
- // This is a hack to prevent a netplay desync due to SI devices
+ // This is a hack to prevent a desync due to SI devices
// being different and returning different values.
// The corresponding code in DeviceGCAdapter has the same check
pad->button = PAD_ERR_STATUS;