diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java index 58b5c622..bfad27cb 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java +++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java @@ -292,6 +292,15 @@ class MainLayoutNumpad extends BaseMainLayout { private void reorderFnKeys() { + String lfnOrder = tt9.getSettings().getLfnKeyOrder(); + String rfnOrder = tt9.getSettings().getRfnKeyOrder(); + + final String newOrder = lfnOrder + "," + rfnOrder; + if (newOrder.equals(lastFnKeyOrder)) { + Logger.d(LOG_TAG, "Preserving current key order: '" + lastFnKeyOrder + "'"); + return; + } + if (view == null) { return; } @@ -303,15 +312,6 @@ class MainLayoutNumpad extends BaseMainLayout { return; } - String lfnOrder = tt9.getSettings().getLfnKeyOrder(); - String rfnOrder = tt9.getSettings().getRfnKeyOrder(); - - final String newOrder = lfnOrder + "," + rfnOrder; - if (newOrder.equals(lastFnKeyOrder)) { - Logger.d(LOG_TAG, "Preserving current key order: '" + lastFnKeyOrder + "'"); - return; - } - Map keyWrappers = new HashMap<>(); for (Map.Entry entry : SettingsVirtualNumpad.KEY_ORDER_MAP.entrySet()) { keyWrappers.put(entry.getValue(), view.findViewById(entry.getValue()));