From c56644cd6dfa35dbfa11118b24a2545d52797c0a Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 14 Jun 2023 06:28:45 +0200
Subject: [PATCH] Fix vulnerability of new NationPickerPopup icon view (#9587)

---
 .../src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt b/core/src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt
index d6ad42b47b..fd36bb7aa9 100644
--- a/core/src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt
+++ b/core/src/com/unciv/ui/screens/newgamescreen/NationPickerPopup.kt
@@ -230,7 +230,7 @@ internal class NationPickerPopup(
             }
 
             // Keyboard: Fist letter of each "word" - "The Ottomans" get T _and_ O
-            val keys = element.translatedName.split(' ').map { it.first() }.toSet()
+            val keys = element.translatedName.split(' ').mapNotNull { it.firstOrNull() }.toSet()
             for (key in keys) {
                 if (key in keySelectMap) {
                     keySelectMap[key]!! += currentSelectInfo