mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 13:49:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/UncivGame.kt
View File

@ -158,15 +158,23 @@ class UncivGame(
override fun dispose() { override fun dispose() {
cancelDiscordEvent?.invoke() cancelDiscordEvent?.invoke()
// Log still running threads (should be only this one and "DestroyJavaVM")
val numThreads = Thread.activeCount()
val threadList = Array(numThreads) { _ -> Thread() }
Thread.enumerate(threadList)
if (::gameInfo.isInitialized){ 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 GameSaver.autoSaveSingleThreaded(gameInfo) // NO new thread
settings.save() settings.save()
} }
// Log still running threads (should be only this one and "DestroyJavaVM")
val numThreads = Thread.activeCount()
val threadList = Array<Thread>(numThreads) { _ -> Thread() }
Thread.enumerate(threadList)
threadList.filter { it !== Thread.currentThread() && it.name != "DestroyJavaVM"}.forEach { threadList.filter { it !== Thread.currentThread() && it.name != "DestroyJavaVM"}.forEach {
println (" Thread ${it.name} still running in UncivGame.dispose().") println (" Thread ${it.name} still running in UncivGame.dispose().")
} }