diff options
| author | jenkins4kodi <jenkins4kodi@users.noreply.github.com> | 2017-05-28 08:23:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 08:23:39 +0200 |
| commit | 107b192e97c630b510897b0282a6da1768d60c01 (patch) | |
| tree | bfcfea118430f2fade77dbb7f157adafdc442bf4 | |
| parent | 74886ff2f5d0a1bff993224b391095e70a8e9cd3 (diff) | |
| parent | e76a38517eb5ece18db5bc6a62e6690408762c8d (diff) | |
Merge pull request #12167 from koying/fixkbdcrashL
| -rw-r--r-- | xbmc/platform/android/activity/AndroidKey.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/platform/android/activity/AndroidKey.cpp b/xbmc/platform/android/activity/AndroidKey.cpp index 1cfe4f4e12..81f5afe80e 100644 --- a/xbmc/platform/android/activity/AndroidKey.cpp +++ b/xbmc/platform/android/activity/AndroidKey.cpp @@ -204,8 +204,10 @@ bool CAndroidKey::onKeyboardEvent(AInputEvent *event) int32_t keycode = AKeyEvent_getKeyCode(event); int32_t deviceId = AInputEvent_getDeviceId(event); + uint16_t unicode = 0; CJNIKeyCharacterMap map = CJNIKeyCharacterMap::load(deviceId); - uint16_t unicode = map.get(keycode, state); + if (map) + unicode = map.get(keycode, state); // Check if we got some special key uint16_t sym = XBMCK_UNKNOWN; |