summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src
diff options
context:
space:
mode:
authorayuanx <ayuanx@gmail.com>2010-01-27 03:29:35 +0000
committerayuanx <ayuanx@gmail.com>2010-01-27 03:29:35 +0000
commitfeea5570191c471d223b791b3fb0b54a1228e7e4 (patch)
tree3532a8c53cff263bfacfa912e804cc417b66301e /Source/Core/InputCommon/Src
parent36a5015bc009da25821705a959fac4301295b01a (diff)
Fixes Issue 2125
An XInput trigger should not be mapped to a button. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4968 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src')
-rw-r--r--Source/Core/InputCommon/Src/SDL.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/SDL.cpp b/Source/Core/InputCommon/Src/SDL.cpp
index 94c230bf03..572d68d407 100644
--- a/Source/Core/InputCommon/Src/SDL.cpp
+++ b/Source/Core/InputCommon/Src/SDL.cpp
@@ -168,7 +168,7 @@ void GetButton(SDL_Joystick *joy, int ControllerID, int buttons, int axes, int h
// Check for a XInput trigger
#ifdef _WIN32
- if(XInput)
+ if(XInput && LeftRight)
{
for(int i = 0; i <= InputCommon::XI_TRIGGER_R; i++)
{