mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-13 22:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ebitenmobileview: Bug fix: Crash when removing a gamepad

Browse Source 
Fixes #1185
This commit is contained in:
Hajime Hoshi 2020-06-09 23:34:07 +09:00
parent a2b97be266
commit f350b03232
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ebitenmobile/gobind.go
View File

@ -675,13 +675,8 @@ public class EbitenView extends ViewGroup implements InputManager.InputDeviceLis
@Override @Override
public void onInputDeviceRemoved(int deviceId) { public void onInputDeviceRemoved(int deviceId) {
InputDevice inputDevice = this.inputManager.getInputDevice(deviceId); // Do not call inputManager.getInputDevice(), which returns null (#1185).
int sources = inputDevice.getSources(); Ebitenmobileview.onInputDeviceRemoved(deviceId);
if ((sources & InputDevice.SOURCE_GAMEPAD) != InputDevice.SOURCE_GAMEPAD &&
(sources & InputDevice.SOURCE_JOYSTICK) != InputDevice.SOURCE_JOYSTICK) {
return;
}
Ebitenmobileview.onGamepadRemoved(deviceId);
} }
// suspendGame suspends the game. // suspendGame suspends the game.

2
cmd/ebitenmobile/gobind.src.go
View File

File diff suppressed because one or more lines are too long

6
mobile/ebitenmobileview/input_android.go
View File

@ -315,7 +315,9 @@ func OnGamepadAdded(deviceID int, name string, buttonNum int, axisNum int, descr
} }
} }
func OnGamepadRemoved(deviceID int) { func OnInputDeviceRemoved(deviceID int) {
id := gamepadIDFromDeviceID(deviceID) if id, ok := deviceIDToGamepadID[deviceID]; ok {
delete(gamepads, id) delete(gamepads, id)
delete(deviceIDToGamepadID, deviceID)
}
} }