Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00
parent ea75a357ca
commit 28b235ef07
531 changed files with 12356 additions and 6286 deletions
--- a/core/src/mindustry/ui/dialogs/PausedDialog.java
+++ b/core/src/mindustry/ui/dialogs/PausedDialog.java
@@ -93,12 +93,19 @@ public class PausedDialog extends BaseDialog{
    }

    void showQuitConfirm(){
-        ui.showConfirm("@confirm", "@quit.confirm", () -> {
+        Runnable quit = () -> {
            wasClient = net.client();
            if(net.client()) netClient.disconnectQuietly();
            runExitSave();
            hide();
-        });
+        };
+
+        if(confirmExit){
+            ui.showConfirm("@confirm", "@quit.confirm", quit);
+        }else{
+            quit.run();
+        }
+
    }

    public void runExitSave(){