From fb67b0ef5a056471250db49aa9280cf3b3ce633d Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 9 Jul 2023 02:27:26 +0900 Subject: [PATCH] fix: not having IME set would cause NPE --- .../modulebasegame/ui/UIKeyboardControlPanel.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index e43bd0036..269ab7095 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -468,9 +468,13 @@ private object Keebsym { val PIE = labels.get(8,1) val MENU = labels.get(6,2) val IME = { - net.torvald.terrarum.gamecontroller.IME.icons[net.torvald.terrarum.gamecontroller.IME.getHighLayerByName( - App.getConfigString("inputmethod") - ).config.lang] ?: labels.get(7, 2) + App.getConfigString("inputmethod").let { imeName -> + if (imeName == "none") labels.get(7, 2) + else net.torvald.terrarum.gamecontroller.IME.icons[net.torvald.terrarum.gamecontroller.IME.getHighLayerByName( + App.getConfigString("inputmethod") + ).config.lang] ?: labels.get(7, 2) + } + } val CRAFTING = labels.get(9,1) } \ No newline at end of file