Merge pull request xbmc#12167 from koying/fixkbdcrashL

Memphiz · May 28, 2017 · 107b192 · 107b192
2 parents 74886ff + e76a385
commit 107b192
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;