From c41fb3591a58b80c89d95d6a56a5d5b8fcc9ef5b Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sat, 13 Nov 2021 22:38:58 +0200
Subject: [PATCH] Caught "null values from musicHistory.peekLast" bug

---
 core/src/com/unciv/ui/audio/MusicController.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/ui/audio/MusicController.kt b/core/src/com/unciv/ui/audio/MusicController.kt
index 00e1e0a1e6..74d3ddbfb5 100644
--- a/core/src/com/unciv/ui/audio/MusicController.kt
+++ b/core/src/com/unciv/ui/audio/MusicController.kt
@@ -87,7 +87,7 @@ class MusicController {
     /** @return the path of the playing track or null if none playing */
     private fun currentlyPlaying(): String = when(state) {
         ControllerState.Playing, ControllerState.PlaySingle, ControllerState.Pause ->
-            musicHistory.peekLast()
+            musicHistory.peekLast() ?: ""
         else -> ""
     }