From 55340817e83d38f3d19024c700eada4584652daa Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 4 May 2020 16:09:04 -0400
Subject: [PATCH] v0.8.0b: fixed error printouts being eaten if game fails to
 start

---
 SPD-classes/src/main/java/com/watabou/noosa/Game.java | 11 ++++++++++-
 .../desktop/DesktopLauncher.java                      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
index 9de8eb025..06503aece 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
@@ -249,7 +249,16 @@ public class Game implements ApplicationListener {
 	}
 	
 	public static void reportException( Throwable tr ) {
-		if (instance != null) instance.logException(tr);
+		if (instance != null) {
+			instance.logException(tr);
+		} else {
+			//fallback if error happened in initialization
+			StringWriter sw = new StringWriter();
+			PrintWriter pw = new PrintWriter(sw);
+			tr.printStackTrace(pw);
+			pw.flush();
+			System.err.println(sw.toString());
+		}
 	}
 	
 	protected void logException( Throwable tr ){
diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
index bd0858136..de81b01da 100644
--- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
+++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
@@ -79,7 +79,7 @@ public class DesktopLauncher {
 						"If you could, please email this error message to the developer (Evan@ShatteredPixel.com):\n\n" +
 						exceptionMsg,
 						"ok", "error", false );
-				Gdx.app.exit();
+				if (Gdx.app != null) Gdx.app.exit();
 			}
 		});