AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed relatively rare crash where the settings were being read but ended up null, not sure how that happened to start with...

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-22 18:35:41 +02:00
parent 31b4680b5f
commit 314b620405
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/GameSaver.kt
View File

@ -48,7 +48,10 @@ class GameSaver {
fun getGeneralSettings(): GameSettings { fun getGeneralSettings(): GameSettings {
val settingsFile = getGeneralSettingsFile() val settingsFile = getGeneralSettingsFile()
if(!settingsFile.exists()) return GameSettings() if(!settingsFile.exists()) return GameSettings()
val settings = json().fromJson(GameSettings::class.java, settingsFile) var settings = json().fromJson(GameSettings::class.java, settingsFile)
// I'm not sure of the circumstances,
// but some people were getting null settings, even though the file existed??? Very odd.
if(settings==null) settings = GameSettings()
val currentTileSets = ImageGetter.atlas.regions.asSequence() val currentTileSets = ImageGetter.atlas.regions.asSequence()
.filter { it.name.startsWith("TileSets") } .filter { it.name.startsWith("TileSets") }