From 8183de7068e2023579a33cdec6830b57fa38e3c5 Mon Sep 17 00:00:00 2001 From: Helium Date: Sun, 20 Mar 2022 20:49:43 +0100 Subject: [PATCH] fix secondary locale sometimes not being loaded --- .../inputmethod/latin/DictionaryFacilitatorImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFacilitatorImpl.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFacilitatorImpl.java index fa7c30835..05ede677a 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFacilitatorImpl.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/DictionaryFacilitatorImpl.java @@ -412,8 +412,8 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { // create / load secondary dictionary final Locale secondaryLocale = Settings.getInstance().getCurrent().mSecondaryLocale; - if (secondaryLocale != null && mainDict != null && - ScriptUtils.getScriptFromSpellCheckerLocale(secondaryLocale) == ScriptUtils.getScriptFromSpellCheckerLocale(mainDict.mLocale)) { + if (secondaryLocale != null && mDictionaryGroup != null && mDictionaryGroup.mLocale != null && + ScriptUtils.getScriptFromSpellCheckerLocale(secondaryLocale) == ScriptUtils.getScriptFromSpellCheckerLocale(mDictionaryGroup.mLocale)) { for (final String subDictType : subDictTypesToUse) { final ExpandableBinaryDictionary subDict = getSubDict(subDictType, context, newLocale, null, dictNamePrefix, account);