From a327b9cfa870c4b9b2775a899804e950c3e617ff Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 1 Jun 2018 12:20:57 -0400 Subject: [PATCH] Fixed iOS map/save loading --- ios/src/io/anuke/mindustry/IOSLauncher.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 6d9db11b85..9eb50f807a 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -28,8 +28,7 @@ import java.util.Collections; import java.util.Date; import java.util.Locale; -import static io.anuke.mindustry.Vars.control; -import static io.anuke.mindustry.Vars.ui; +import static io.anuke.mindustry.Vars.*; import static org.robovm.apple.foundation.NSPathUtilities.getDocumentsDirectory; public class IOSLauncher extends IOSApplication.Delegate { @@ -120,7 +119,7 @@ public class IOSLauncher extends IOSApplication.Delegate { FileHandle file = Gdx.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent()); Gdx.files.absolute(url.getPath()).copyTo(file); - if(file.extension().equalsIgnoreCase("mins")){ //open save + if(file.extension().equalsIgnoreCase(saveExtension)){ //open save if(SaveIO.isSaveValid(file)){ try{ @@ -133,12 +132,14 @@ public class IOSLauncher extends IOSApplication.Delegate { ui.showError("$text.save.import.invalid"); } - }else if(file.extension().equalsIgnoreCase("png")){ //open map - if(!ui.editor.isShown()){ - ui.editor.show(); - } + }else if(file.extension().equalsIgnoreCase(mapExtension)){ //open map + Gdx.app.postRunnable(() -> { + if (!ui.editor.isShown()) { + ui.editor.show(); + } - ui.editor.beginEditMap(file.read()); + ui.editor.beginEditMap(file.read()); + }); } }); }