diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2018-08-05 00:05:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-05 00:05:11 -0700 |
| commit | 0a8e04e469b30b2331096788db76be7fd6487bbe (patch) | |
| tree | d0cd6639d4f4c759807b8920cec552e9b1b7f91e /Source/Android | |
| parent | 1da910d984b85ee74740bad0e2c7b3330810f494 (diff) | |
| parent | ec5e46fa7a3e9c2da68777d718155ff768a4b238 (diff) | |
Merge pull request #7301 from zackhow/wiicontroller
Android: Return 0 on fail on WiimoteReal IOWrite and update WiimoteNew defaults
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/assets/WiimoteNew.ini | 6 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini index 9fcbad5130..205733d90c 100644 --- a/Source/Android/app/src/main/assets/WiimoteNew.ini +++ b/Source/Android/app/src/main/assets/WiimoteNew.ini @@ -267,7 +267,7 @@ Turntable/Stick/Radius = 100,000000 Turntable/Effect/Dial = `Axis 621` Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Right = `Axis 624` -Source = 1 +Source = 0 [Wiimote3] Device = Android/6/Touchscreen Buttons/A = `Button 100` @@ -402,7 +402,7 @@ Turntable/Stick/Radius = 100,000000 Turntable/Effect/Dial = `Axis 621` Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Right = `Axis 624` -Source = 1 +Source = 0 [Wiimote4] Device = Android/7/Touchscreen Buttons/A = `Button 100` @@ -537,4 +537,4 @@ Turntable/Stick/Radius = 100,000000 Turntable/Effect/Dial = `Axis 621` Turntable/Crossfade/Left = `Axis 623` Turntable/Crossfade/Right = `Axis 624` -Source = 1 +Source = 0 diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java index a38f7ecd4b..18fe41b584 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java @@ -107,7 +107,7 @@ public class Java_WiimoteAdapter 1000); if (write < 0) - return -1; + return 0; return write + 1; } |