diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 20c7fd0d72..8114043046 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.5.30" const val appName = "Unciv" - const val appCodeNumber = 659 - const val appVersion = "3.18.11" + const val appCodeNumber = 660 + const val appVersion = "3.18.11-patch1" const val gdxVersion = "1.10.0" const val roboVMVersion = "2.3.1" diff --git a/core/src/com/unciv/CrashScreen.kt b/core/src/com/unciv/CrashScreen.kt index 9c915fddd0..62aa515a06 100644 --- a/core/src/com/unciv/CrashScreen.kt +++ b/core/src/com/unciv/CrashScreen.kt @@ -12,8 +12,7 @@ import java.io.PrintWriter import java.io.StringWriter /** Screen to crash to when an otherwise unhandled exception or error is thrown. */ -class CrashScreen(message: String): BaseScreen() { - constructor(exception: Throwable): this(exception.stringify()) +class CrashScreen(val exception: Throwable): BaseScreen() { private companion object { fun Throwable.stringify(): String { @@ -23,7 +22,7 @@ class CrashScreen(message: String): BaseScreen() { } } - val text = generateReportHeader() + message + val text = generateReportHeader() + exception.stringify() var copied = false private set @@ -118,7 +117,7 @@ class CrashScreen(message: String): BaseScreen() { } val closeButton = "Close Unciv".toButton() .onClick { - Gdx.app.exit() + throw exception // throw the original exception to allow crash recording on GP } val buttonsTable = Table()