libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Fix KeyEvent NullPointerException

Browse Source 
Could happen with some special symbols from the virtual keyboard
This commit is contained in:
dhewg 2011-03-17 22:02:17 +01:00
parent 8ab136dafb
commit 47e9db8fdf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
View File

@ -119,9 +119,13 @@ public class ScummVMEvents implements
// sequence of characters
if (action == KeyEvent.ACTION_MULTIPLE &&
keyCode == KeyEvent.KEYCODE_UNKNOWN) {
KeyCharacterMap m = KeyCharacterMap.load(e.getDeviceId());
final KeyCharacterMap m = KeyCharacterMap.load(e.getDeviceId());
final KeyEvent[] es = m.getEvents(e.getCharacters().toCharArray());
for (KeyEvent s : m.getEvents(e.getCharacters().toCharArray())) {
if (es == null)
return true;
for (KeyEvent s : es) {
_scummvm.pushEvent(JE_KEY, s.getAction(), s.getKeyCode(),
s.getUnicodeChar() & KeyCharacterMap.COMBINING_ACCENT_MASK,
s.getMetaState(), s.getRepeatCount());