mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-09 02:25:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash starting up on Lollipop (#6412)

Browse Source
This commit is contained in:
SomeTroglodyte 2022-03-22 20:19:23 +01:00 committed by GitHub
parent 59dd696c3f
commit 80d9872b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -5,13 +5,12 @@ import com.badlogic.gdx.Gdx
import com.badlogic.gdx.files.FileHandle
import com.unciv.JsonParser
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.GameSaver
import com.unciv.ui.utils.Fonts
import java.io.File
import java.text.Collator
import java.util.*
import kotlin.collections.HashSet
import kotlin.io.path.Path
data class WindowState (val width: Int = 900, val height: Int = 600)
@ -119,7 +118,7 @@ class GameSettings {
fun getSettingsForPlatformLaunchers(base: String = ""): GameSettings {
// FileHandle is Gdx, but the class and JsonParser are not dependent on app initialization
// If fact, at this point Gdx.app or Gdx.files are null but this still works.
val file = FileHandle(Path(base, GameSaver.settingsFileName).toString())
val file = FileHandle(base + File.separator + GameSaver.settingsFileName)
return if (file.exists())
JsonParser().getFromJson(
GameSettings::class.java,