diff --git a/android/src/com/unciv/app/AndroidGame.kt b/android/src/com/unciv/app/AndroidGame.kt index b0403ea568..b98191c5df 100644 --- a/android/src/com/unciv/app/AndroidGame.kt +++ b/android/src/com/unciv/app/AndroidGame.kt @@ -78,4 +78,5 @@ class AndroidGame(private val activity: Activity) : UncivGame() { } } + fun isInitializedProxy() = super.isInitialized } diff --git a/android/src/com/unciv/app/AndroidLauncher.kt b/android/src/com/unciv/app/AndroidLauncher.kt index e0c61d5b0b..aab09a2d18 100644 --- a/android/src/com/unciv/app/AndroidLauncher.kt +++ b/android/src/com/unciv/app/AndroidLauncher.kt @@ -70,7 +70,7 @@ open class AndroidLauncher : AndroidApplication() { override fun onPause() { val game = this.game!! - if (game.isInitialized + if (game.isInitializedProxy() && game.gameInfo != null && game.settings.multiplayer.turnCheckerEnabled && game.files.getMultiplayerSaves().any() diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 0d0e6408f8..b318d8e37c 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -137,7 +137,9 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci var worldScreen: WorldScreen? = null private set - var isInitialized = false + /** Flag used only during initialization until the end of [create] */ + protected var isInitialized = false + private set /** A wrapped render() method that crashes to [CrashScreen] on a unhandled exception or error. */ private val wrappedCrashHandlingRender = { super.render() }.wrapCrashHandlingUnit()