Merge pull request #7301 from zackhow/wiicontroller

Android: Return 0 on fail on WiimoteReal IOWrite and update WiimoteNew defaults
dolphin-emu · Aug 5, 2018 · 0a8e04e · 0a8e04e
2 parents 1da910d + ec5e46f
commit 0a8e04e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -107,7 +107,7 @@ public static int Output(int index, byte[] buf, int size)
 				1000);
 
 		if (write < 0)
-			return -1;
+			return 0;
 
 		return write + 1;
 	}