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);
+            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,6 +62,7 @@ public class MapsDialog extends FloatingDialog{
         if(!ios){
             buttons.addImageTextButton("$editor.importmap", "icon-load", iconsize, () -> {
                 platform.showFileChooser("$editor.importmap", "Map File", file -> {
+                    ui.loadAnd(() -> {
                         maps.tryCatchMapError(() -> {
                             if(MapIO.isImage(file)){
                                 ui.showError("$editor.errorimage");
@@ -96,7 +97,8 @@ public class MapsDialog extends FloatingDialog{
                             }else if(conflict != null){
                                 ui.showConfirm("$confirm", "$editor.overwrite.confirm", () -> {
                                     maps.tryCatchMapError(() -> {
-                                    maps.importMap(file);
+                                        maps.removeMap(conflict);
+                                        maps.importMap(map.file);
                                         setup();
                                     });
                                 });
@@ -106,6 +108,7 @@ public class MapsDialog extends FloatingDialog{
                             }
 
                         });
+                    });
                 }, true, FileChooser.anyMapFiles);
             }).size(210f, 64f);
         }