From 97443a86cba22b474deaeaa871de97a016008d6b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 24 Aug 2019 11:52:14 -0400 Subject: [PATCH] fixed a crash that shouldn't even happen --- core/src/io/anuke/mindustry/core/UI.java | 1 + core/src/io/anuke/mindustry/net/CrashSender.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index ee10191570..a827085625 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -225,6 +225,7 @@ public class UI implements ApplicationListener{ @Override public void resize(int width, int height){ + if(Core.scene == null) return; Core.scene.resize(width, height); Events.fire(new ResizeEvent()); } diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java index f7370b629d..9999d8e9af 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/core/src/io/anuke/mindustry/net/CrashSender.java @@ -97,7 +97,7 @@ public class CrashSender{ ex(() -> value.addChild("server", new JsonValue(fs))); ex(() -> value.addChild("players", new JsonValue(Vars.playerGroup.size()))); ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name()))); - ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name")))); + ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name") + (OS.is64Bit ? "64" : "32")))); ex(() -> value.addChild("trace", new JsonValue(parseException(exception)))); boolean[] sent = {false};