From 5eba4a360d6eb839870c2f4083b8a810979608ab Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Sep 2019 20:21:37 -0400 Subject: [PATCH] Fixed Steam offline crash --- .../io/anuke/mindustry/desktop/DesktopLauncher.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index a9f18600b7..2a5dcd433c 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -125,11 +125,11 @@ public class DesktopLauncher extends ClientLauncher{ if(!SteamAPI.init()){ Log.err("Steam client not running."); }else{ - Vars.steam = true; initSteam(args); - + Vars.steam = true; } - }catch(Exception e){ + }catch(Throwable e){ + steam = false; Log.err("Failed to load Steam native libraries."); e.printStackTrace(); } @@ -199,9 +199,6 @@ public class DesktopLauncher extends ClientLauncher{ @Override public Array getExternalMaps(){ - if(steam && SVars.workshop == null){ - SVars.workshop = new SWorkshop(); - } return !steam ? super.getExternalMaps() : SVars.workshop.getMapFiles(); } @@ -222,7 +219,6 @@ public class DesktopLauncher extends ClientLauncher{ @Override public NetProvider getNet(){ - if(steam && SVars.net == null) SVars.net = new SNet(new ArcNetImpl()); return steam ? SVars.net : new ArcNetImpl(); }