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

Fix crash handling not disposing previous screens (#7301)

Browse Source
This commit is contained in:
Timo T 2022-06-25 21:10:42 +02:00 committed by GitHub
parent 9d6a945a91
commit 725c298a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
* - Font (hence Fonts.resetFont() inside setSkin()) * - Font (hence Fonts.resetFont() inside setSkin())
*/ */
settings = gameSaver.getGeneralSettings() // needed for the screen settings = gameSaver.getGeneralSettings() // needed for the screen
setScreen(GameStartScreen()) // NOT dependent on any atlas or skin setAsRootScreen(GameStartScreen()) // NOT dependent on any atlas or skin
GameSounds.init() GameSounds.init()
musicController = MusicController() // early, but at this point does only copy volume from settings musicController = MusicController() // early, but at this point does only copy volume from settings
@ -149,8 +149,8 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
ImageGetter.ruleset = RulesetCache.getVanillaRuleset() // so that we can enter the map editor without having to load a game first ImageGetter.ruleset = RulesetCache.getVanillaRuleset() // so that we can enter the map editor without having to load a game first
when { when {
settings.isFreshlyCreated -> pushScreen(LanguagePickerScreen()) settings.isFreshlyCreated -> setAsRootScreen(LanguagePickerScreen())
deepLinkedMultiplayerGame == null -> pushScreen(MainMenuScreen()) deepLinkedMultiplayerGame == null -> setAsRootScreen(MainMenuScreen())
else -> tryLoadDeepLinkedGame() else -> tryLoadDeepLinkedGame()
} }
@ -255,6 +255,13 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
Gdx.graphics.requestRendering() Gdx.graphics.requestRendering()
} }
/** Removes & [disposes][BaseScreen.dispose] all currently active screens in the [screenStack] and sets the given screen as the only screen. */
private fun setAsRootScreen(root: BaseScreen) {
for (screen in screenStack) screen.dispose()
screenStack.clear()
screenStack.addLast(root)
setScreen(root)
}
/** Adds a screen to be displayed instead of the current screen, with an option to go back to the previous screen by calling [popScreen] */ /** Adds a screen to be displayed instead of the current screen, with an option to go back to the previous screen by calling [popScreen] */
fun pushScreen(newScreen: BaseScreen) { fun pushScreen(newScreen: BaseScreen) {
screenStack.addLast(newScreen) screenStack.addLast(newScreen)
@ -313,7 +320,9 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
if (deepLinkedMultiplayerGame == null) return@run if (deepLinkedMultiplayerGame == null) return@run
launchOnGLThread { launchOnGLThread {
pushScreen(LoadingScreen(getScreen()!!)) if (screenStack.isEmpty() || screenStack[0] !is GameStartScreen) {
setAsRootScreen(LoadingScreen(getScreen()!!))
}
} }
try { try {
onlineMultiplayer.loadGame(deepLinkedMultiplayerGame!!) onlineMultiplayer.loadGame(deepLinkedMultiplayerGame!!)
@ -398,7 +407,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
Log.error("Uncaught throwable", ex) Log.error("Uncaught throwable", ex)
if (platformSpecificHelper?.handleUncaughtThrowable(ex) == true) return if (platformSpecificHelper?.handleUncaughtThrowable(ex) == true) return
Gdx.app.postRunnable { Gdx.app.postRunnable {
setScreen(CrashScreen(ex)) setAsRootScreen(CrashScreen(ex))
} }
} }