Merge branch 'master' into multiplayer

core/src/io/anuke/mindustry/ui/MenuDialog.java

@@ -2,10 +2,13 @@ package io.anuke.mindustry.ui;
 
 import static io.anuke.mindustry.Vars.ui;
 
+import com.badlogic.gdx.utils.reflect.ClassReflection;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.net.Net;
+import io.anuke.ucore.UCore;
+import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.scene.Element;
 import io.anuke.ucore.scene.builders.build;
 import io.anuke.ucore.scene.builders.imagebutton;
@@ -78,7 +81,8 @@ public class MenuDialog extends FloatingDialog{
             content().row();
 
 			content().addButton("$text.quit", () -> {
-				Vars.ui.showConfirm("$text.confirm", "$text.quit.confirm", () -> {
+        Vars.ui.showConfirm("$text.confirm", "$text.quit.confirm", () -> {
+					runSave();
 					hide();
 					GameState.set(State.menu);
 				});
@@ -106,6 +110,7 @@ public class MenuDialog extends FloatingDialog{
 			
 			new imagebutton("icon-quit", isize, () -> {
 				Vars.ui.showConfirm("$text.confirm", "$text.quit.confirm", () -> {
+					runSave();
 					hide();
 					GameState.set(State.menu);
 				});
@@ -120,4 +125,22 @@ public class MenuDialog extends FloatingDialog{
 			build.end();
 		}
 	}
+
+	private void runSave(){
+		if(Vars.control.getSaves().getCurrent() == null ||
+				!Vars.control.getSaves().getCurrent().isAutosave()) return;
+
+		Vars.ui.showLoading("$text.saveload");
+
+		Timers.runTask(5f, () -> {
+			Vars.ui.hideLoading();
+			try{
+				Vars.control.getSaves().getCurrent().save();
+			}catch(Throwable e){
+				e = (e.getCause() == null ? e : e.getCause());
+
+				Vars.ui.showError("[orange]"+ Bundles.get("text.savefail")+"\n[white]" + ClassReflection.getSimpleName(e.getClass()) + ": " + e.getMessage() + "\n" + "at " + e.getStackTrace()[0].getFileName() + ":" + e.getStackTrace()[0].getLineNumber());
+			}
+		});
+	}
 }

core/src/io/anuke/mindustry/ui/SaveDialog.java

@@ -46,6 +46,7 @@ public class SaveDialog extends LoadDialog{
 	}
 
 	void save(SaveSlot slot){
+
 		Vars.ui.showLoading("$text.saveload");
 
 		Timers.runTask(5f, () -> {