mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Updated to build 28

Browse Source
This commit is contained in:
Anuken 2018-02-23 15:11:42 -05:00
parent 2adacccf7d
commit de340255fe
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Fri Feb 23 14:48:54 EST 2018 #Fri Feb 23 15:06:51 EST 2018
version=release version=release
androidBuildCode=266 androidBuildCode=267
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=custom build build=28

7
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@ -32,16 +32,19 @@ public class SettingsMenuDialog extends SettingsDialog{
public SettingsMenuDialog(){ public SettingsMenuDialog(){
setStyle(Core.skin.get("dialog", WindowStyle.class)); setStyle(Core.skin.get("dialog", WindowStyle.class));
hidden(()->{ hidden(() -> {
if(!state.is(State.menu)){ if(!state.is(State.menu)){
if(!wasPaused || Net.active()) if(!wasPaused || Net.active())
state.set(State.playing); state.set(State.playing);
} }
}); });
shown(()->{ shown(() -> {
if(!state.is(State.menu)){ if(!state.is(State.menu)){
wasPaused = state.is(State.paused); wasPaused = state.is(State.paused);
if(ui.paused.getScene() != null){
wasPaused = ui.paused.wasPaused;
}
if(!Net.active()) state.set(State.paused); if(!Net.active()) state.set(State.paused);
ui.paused.hide(); ui.paused.hide();
} }