Merge remote-tracking branch 'origin/master'

2019-11-14 14:59:10 -05:00
parent 30ea285ca0 32a5c7b769
commit ec7f49c94b
5 changed files with 317 additions and 288 deletions
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -360,7 +360,11 @@ public class SettingsMenuDialog extends SettingsDialog{

        keyDown(key -> {
            if(key == KeyCode.ESCAPE || key == KeyCode.BACK){
-                hide();
+                if(prefs.getChildren().first() != menu){
+                    back();
+                }else{
+                    hide();
+                }
            }
        });
    }