From ceb08acf234dde3b3dc30bae2142db3464dd3e8e Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 18 Oct 2014 07:33:51 -0500 Subject: [PATCH] Fix a crash on Android when unplugging a controller during emulation. If the action we are getting is a ACTION_CANCEL, it means that the "gesture" is aborted and we shouldn't perform any more actions on it. --- .../dolphinemu/dolphinemu/emulation/EmulationActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index cd01979afa..fb96bec559 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -313,6 +313,10 @@ public final class EmulationActivity extends Activity return super.dispatchGenericMotionEvent(event); } + // Don't attempt to do anything if we are disconnecting a device. + if (event.getActionMasked() == MotionEvent.ACTION_CANCEL) + return true; + InputDevice input = event.getDevice(); List motions = input.getMotionRanges();