Crash fixes, additional controller support

2018-01-10 14:43:29 -05:00
parent d6532c26bb
commit a9546de894
16 changed files with 63 additions and 28 deletions
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -95,7 +95,11 @@ public class DesktopLauncher {
 						presence.state = Strings.capitalize(Vars.control.getMode().toString());
 					}
 				}else{
-					presence.state = "In Menu";
+					if(Vars.ui.editor != null && Vars.ui.editor.isShown()){
+						presence.state = "In Editor";
+					}else {
+						presence.state = "In Menu";
+					}
 				}

 				presence.largeImageKey = "logo";