diff --git a/src/main/java/io/eiren/vr/Main.java b/src/main/java/io/eiren/vr/Main.java index 94ac1075a..ce5d719b0 100644 --- a/src/main/java/io/eiren/vr/Main.java +++ b/src/main/java/io/eiren/vr/Main.java @@ -19,10 +19,19 @@ public class Main { e1.printStackTrace(); } - VRServer vrServer = new VRServer(); - vrServer.start(); - - new VRServerGUI(vrServer); + try { + VRServer vrServer = new VRServer(); + vrServer.start(); + new VRServerGUI(vrServer); + } catch(Throwable e) { + e.printStackTrace(); + } finally { + try { + Thread.sleep(2000L); + } catch(InterruptedException e) { + e.printStackTrace(); + } + } } } diff --git a/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java b/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java index 559337dcf..8b58cbc9a 100644 --- a/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java +++ b/src/main/java/io/eiren/vr/processor/TrackerBodyPosition.java @@ -26,7 +26,7 @@ public enum TrackerBodyPosition { } public static TrackerBodyPosition getByDesignation(String designation) { - return byDesignation.get(designation.toLowerCase()); + return designation == null ? null : byDesignation.get(designation.toLowerCase()); } static {