curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: not having IME set would cause NPE

Browse Source
This commit is contained in:
minjaesong
2023-07-09 02:27:26 +09:00
parent 7c7b3de68d
commit fb67b0ef5a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -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)
}