piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1323 from Sonicadvance1/Android-crash

Browse Source 
Fix a crash on Android when unplugging a controller during emulation.
This commit is contained in:
Ryan Houdek
2014-10-19 08:48:52 -05:00
parent b3cee80faa ceb08acf23
commit 939fa492c8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
View File

@ -313,6 +313,10 @@ public final class EmulationActivity extends Activity
return super.dispatchGenericMotionEvent(event); 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(); InputDevice input = event.getDevice();
List<InputDevice.MotionRange> motions = input.getMotionRanges(); List<InputDevice.MotionRange> motions = input.getMotionRanges();