Fixed map loading bugs

core/src/io/anuke/mindustry/maps/Maps.java

@@ -184,7 +184,7 @@ public class Maps{
         FileHandle dest = findFile();
         file.copyTo(dest);
 
-        loadMap(dest, true);
+        createNewPreview(loadMap(dest, true), true);
     }
 
     /** Attempts to run the following code;
@@ -341,7 +341,7 @@ public class Maps{
     private void createAllPreviews(){
         Core.app.post(() -> {
             for(Map map : previewList){
-                createNewPreview(map);
+                createNewPreview(map, false);
             }
             previewList.clear();
         });
@@ -351,12 +351,16 @@ public class Maps{
         Core.app.post(() -> previewList.add(map));
     }
 
-    private void createNewPreview(Map map){
+    private void createNewPreview(Map map, boolean immediate){
         try{
             //if it's here, then the preview failed to load or doesn't exist, make it
             //this has to be done synchronously!
             Pixmap pix = MapIO.generatePreview(map);
-            Core.app.post(() -> map.texture = new Texture(pix));
+            if(immediate){
+                map.texture = new Texture(pix);
+            }else{
+                Core.app.post(() -> map.texture = new Texture(pix));
+            }
             executor.submit(() -> {
                 try{
                     map.previewFile().writePNG(pix);
@@ -404,7 +408,7 @@ public class Maps{
         return customMapDirectory.child("map_" + i + "." + mapExtension);
     }
 
-    private void loadMap(FileHandle file, boolean custom) throws IOException{
+    private Map loadMap(FileHandle file, boolean custom) throws IOException{
         Map map = MapIO.createMap(file, custom);
 
         if(map.name() == null){
@@ -413,6 +417,7 @@ public class Maps{
 
         maps.add(map);
         maps.sort();
+        return map;
     }
 
     private void loadCustomMaps(){

core/src/io/anuke/mindustry/type/Zone.java

@@ -42,7 +42,7 @@ public class Zone extends UnlockableContent{
 
     @Override
     public void load(){
-        preview = Core.atlas.find(name);
+        preview = Core.atlas.find("zone-" + name);
     }
 
     public Rules getRules(){

core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java

@@ -62,49 +62,52 @@ public class MapsDialog extends FloatingDialog{
         if(!ios){
             buttons.addImageTextButton("$editor.importmap", "icon-load", iconsize, () -> {
                 platform.showFileChooser("$editor.importmap", "Map File", file -> {
-                    maps.tryCatchMapError(() -> {
-                        if(MapIO.isImage(file)){
-                            ui.showError("$editor.errorimage");
-                            return;
-                        }
+                    ui.loadAnd(() -> {
+                        maps.tryCatchMapError(() -> {
+                            if(MapIO.isImage(file)){
+                                ui.showError("$editor.errorimage");
+                                return;
+                            }
 
-                        Map map;
-                        if(file.extension().equalsIgnoreCase(mapExtension)){
-                            map = MapIO.createMap(file, true);
-                        }else{
-                            map = maps.makeLegacyMap(file);
-                        }
+                            Map map;
+                            if(file.extension().equalsIgnoreCase(mapExtension)){
+                                map = MapIO.createMap(file, true);
+                            }else{
+                                map = maps.makeLegacyMap(file);
+                            }
 
-                        //when you attempt to import a save, it will have no name, so generate one
-                        String name = map.tags.getOr("name", () -> {
-                            String result = "unknown";
-                            int number = 0;
-                            while(maps.byName(result + number++) != null) ;
-                            return result + number;
-                        });
-
-                        //this will never actually get called, but it remains just in case
-                        if(name == null){
-                            ui.showError("$editor.errorname");
-                            return;
-                        }
-
-                        Map conflict = maps.all().find(m -> m.name().equals(name));
-
-                        if(conflict != null && !conflict.custom){
-                            ui.showInfo(Core.bundle.format("editor.import.exists", name));
-                        }else if(conflict != null){
-                            ui.showConfirm("$confirm", "$editor.overwrite.confirm", () -> {
-                                maps.tryCatchMapError(() -> {
-                                    maps.importMap(file);
-                                    setup();
-                                });
+                            //when you attempt to import a save, it will have no name, so generate one
+                            String name = map.tags.getOr("name", () -> {
+                                String result = "unknown";
+                                int number = 0;
+                                while(maps.byName(result + number++) != null) ;
+                                return result + number;
                             });
-                        }else{
-                            maps.importMap(map.file);
-                            setup();
-                        }
 
+                            //this will never actually get called, but it remains just in case
+                            if(name == null){
+                                ui.showError("$editor.errorname");
+                                return;
+                            }
+
+                            Map conflict = maps.all().find(m -> m.name().equals(name));
+
+                            if(conflict != null && !conflict.custom){
+                                ui.showInfo(Core.bundle.format("editor.import.exists", name));
+                            }else if(conflict != null){
+                                ui.showConfirm("$confirm", "$editor.overwrite.confirm", () -> {
+                                    maps.tryCatchMapError(() -> {
+                                        maps.removeMap(conflict);
+                                        maps.importMap(map.file);
+                                        setup();
+                                    });
+                                });
+                            }else{
+                                maps.importMap(map.file);
+                                setup();
+                            }
+
+                        });
                     });
                 }, true, FileChooser.anyMapFiles);
             }).size(210f, 64f);