diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-19 08:48:52 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-10-19 08:48:52 -0500 |
| commit | 939fa492c857929d48c2744cc7c570984ea130fb (patch) | |
| tree | 5e549a7a9d8cf345d04e8502b7a1f66acf0b993c /Source/Android | |
| parent | b3cee80faa5b5221322b412c68e5a0fd07aba2ce (diff) | |
| parent | ceb08acf234dde3b3dc30bae2142db3464dd3e8e (diff) | |
Merge pull request #1323 from Sonicadvance1/Android-crash
Fix a crash on Android when unplugging a controller during emulation.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
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<InputDevice.MotionRange> motions = input.getMotionRanges(); |