From 19c7dbe3909ded2152da63be53ed71e8ce2db7cb Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 25 Sep 2019 14:39:51 +0700
Subject: [PATCH] Tack on another fix for a separate crash

---
 .../main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
index a901da7b23..f8d09cedc7 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
@@ -302,7 +302,8 @@ public final class KeyboardPickerActivity extends AppCompatActivity {
 
   private static void switchKeyboard(int position) {
     setSelection(position);
-    HashMap<String, String> kbInfo = keyboardsList.get(position);
+    int listPosition = (position >= keyboardsList.size()) ? keyboardsList.size()-1 : position;
+    HashMap<String, String> kbInfo = keyboardsList.get(listPosition);
     String pkgId = kbInfo.get(KMManager.KMKey_PackageID);
     if (pkgId == null || pkgId.isEmpty()) {
       pkgId = KMManager.KMDefault_UndefinedPackageID;