diff --git a/core/src/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java index 4069acd611..677607ee66 100644 --- a/core/src/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java @@ -111,7 +111,9 @@ public class GameOverDialog extends BaseDialog{ }else{ buttons.button("@menu", () -> { hide(); - logic.reset(); + if(!ui.paused.checkPlaytest()){ + logic.reset(); + } }).size(140f, 60f); } } diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java index a09262c614..0b88e36b17 100644 --- a/core/src/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -112,15 +112,22 @@ public class PausedDialog extends BaseDialog{ } } - public void runExitSave(){ - if(state.isEditor() && !wasClient){ - ui.editor.resumeEditing(); - return; - }else if(state.playtestingMap != null){ + public boolean checkPlaytest(){ + if(state.playtestingMap != null){ //no exit save here var testing = state.playtestingMap; logic.reset(); ui.editor.resumeAfterPlaytest(testing); + return true; + } + return false; + } + + public void runExitSave(){ + if(state.isEditor() && !wasClient){ + ui.editor.resumeEditing(); + return; + }else if(checkPlaytest()){ return; }