summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java24
1 files changed, 20 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
index 3e2c83bf66..87d816d93e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
@@ -76,13 +76,29 @@ public class Java_GCAdapter {
}
public static int Input() {
- int read = usb_con.bulkTransfer(usb_in, controller_payload, controller_payload.length, 16);
- return read;
+ if (usb_in != null)
+ {
+ int read = usb_con.bulkTransfer(usb_in, controller_payload, controller_payload.length, 16);
+ return read;
+ }
+ else
+ {
+ // TODO Is this right?
+ return 0;
+ }
}
public static int Output(byte[] rumble) {
- int size = usb_con.bulkTransfer(usb_out, rumble, 5, 16);
- return size;
+ if (usb_out != null)
+ {
+ int size = usb_con.bulkTransfer(usb_out, rumble, 5, 16);
+ return size;
+ }
+ else
+ {
+ // TODO Is this right?
+ return 0;
+ }
}
public static void OpenAdapter()