ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'JasonBrownDeveloper-master'

This commit is contained in:
Gregory Hainaut 2015-08-03 19:37:12 +02:00
parent e010004f1f c0f85de17f
commit 762930516a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/onepad/joystick.cpp
View File

@ -218,7 +218,7 @@ bool JoystickInfo::Init(int id)
// Keep the 4 hat buttons too (usb driver). (left pressure does not work with recent kernel). Moreover the pressure // Keep the 4 hat buttons too (usb driver). (left pressure does not work with recent kernel). Moreover the pressure
// work sometime on half axis neg others time in fulll axis. So better keep them as button for the moment // work sometime on half axis neg others time in fulll axis. So better keep them as button for the moment
u32 found_hack = devname.find(string("PLAYSTATION(R)3")); u32 found_hack = devname.find(string("PLAYSTATION(R)3"));
if (found_hack != string::npos) { if (found_hack != string::npos && numaxes > 4) {
numbuttons = 4; // (select, start, l3, r3) numbuttons = 4; // (select, start, l3, r3)
// Enable this hack in bluetooth too. It avoid to restart the onepad gui // Enable this hack in bluetooth too. It avoid to restart the onepad gui
numbuttons += 4; // the 4 hat buttons numbuttons += 4; // the 4 hat buttons