abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
-rw-r--r--srcs/juloo.keyboard2/Keyboard2.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index e32de42..fa4956c 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -80,10 +80,14 @@ public class Keyboard2 extends InputMethodService
private void refreshSubtypeLayout(InputMethodSubtype subtype)
{
- if (_config.layout == -1)
- _currentTextLayout = Config.layoutId_of_string(subtype.getExtraValueOf("default_layout"));
- else
- _currentTextLayout = _config.layout;
+ int l = _config.layout;;
+ if (l == -1)
+ {
+ String s = subtype.getExtraValueOf("default_layout");
+ if (s != null)
+ l = Config.layoutId_of_string(s);
+ }
+ _currentTextLayout = l;
}
private int accents_of_subtype(InputMethodSubtype subtype)