From de340255fea4f4cc85c934cbab6774ab6ed0493c Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Feb 2018 15:11:42 -0500 Subject: [PATCH] Updated to build 28 --- core/assets/version.properties | 6 +++--- .../io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 49eb791369..7fe28e0b4f 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Feb 23 14:48:54 EST 2018 +#Fri Feb 23 15:06:51 EST 2018 version=release -androidBuildCode=266 +androidBuildCode=267 name=Mindustry code=3.3 -build=custom build +build=28 diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 34d8404065..6d2e79c610 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -32,16 +32,19 @@ public class SettingsMenuDialog extends SettingsDialog{ public SettingsMenuDialog(){ setStyle(Core.skin.get("dialog", WindowStyle.class)); - hidden(()->{ + hidden(() -> { if(!state.is(State.menu)){ if(!wasPaused || Net.active()) state.set(State.playing); } }); - shown(()->{ + shown(() -> { if(!state.is(State.menu)){ wasPaused = state.is(State.paused); + if(ui.paused.getScene() != null){ + wasPaused = ui.paused.wasPaused; + } if(!Net.active()) state.set(State.paused); ui.paused.hide(); }