wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wait for autosave thread while closing (#2580)

Browse source
This commit is contained in:
Jack Rainy 2020-05-05 08:51:41 +03:00 committed by GitHub
parent 9a5afced0d
commit 647a0c9ff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/com/unciv/UncivGame.kt
View file

@ -158,15 +158,23 @@ class UncivGame(
override fun dispose() {
cancelDiscordEvent?.invoke()
if (::gameInfo.isInitialized){
GameSaver.autoSaveSingleThreaded(gameInfo) // NO new thread
settings.save()
}
// Log still running threads (should be only this one and "DestroyJavaVM")
val numThreads = Thread.activeCount()
val threadList = Array<Thread>(numThreads) { _ -> Thread() }
val threadList = Array(numThreads) { _ -> Thread() }
Thread.enumerate(threadList)
if (::gameInfo.isInitialized){
val autoSaveThread = threadList.firstOrNull { it.name == "Autosave" }
if (autoSaveThread != null && autoSaveThread.isAlive) {
// auto save is already in progress (e.g. started by onPause() event)
// let's allow it to finish and do not try to autosave second time
autoSaveThread.join()
} else
GameSaver.autoSaveSingleThreaded(gameInfo) // NO new thread
settings.save()
}
threadList.filter { it !== Thread.currentThread() && it.name != "DestroyJavaVM"}.forEach {
println (" Thread ${it.name} still running in UncivGame.dispose().")
}