Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2019-09-09 16:22:40 -04:00
parent 5a3fbf33df 5bed0f3bcc
commit 82493c596d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/io/anuke/mindustry/AndroidLauncher.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class AndroidLauncher extends AndroidApplication{
SaveSlot slot = control.saves.importSave(file); SaveSlot slot = control.saves.importSave(file);
ui.load.runLoadSave(slot); ui.load.runLoadSave(slot);
}catch(IOException e){ }catch(IOException e){
ui.showException("save.import.fail", e); ui.showException("$save.import.fail", e);
} }
}else{ }else{
ui.showErrorMessage("$save.import.invalid"); ui.showErrorMessage("$save.import.invalid");
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
+1 -1
View File
@@ -178,7 +178,7 @@ public class LoadDialog extends FloatingDialog{
setup(); setup();
}catch(IOException e){ }catch(IOException e){
e.printStackTrace(); e.printStackTrace();
ui.showException("save.import.fail", e); ui.showException("$save.import.fail", e);
} }
}else{ }else{
ui.showErrorMessage("$save.import.invalid"); ui.showErrorMessage("$save.import.invalid");
ios/src/io/anuke/mindustry/IOSLauncher.java
+2 -2
View File
@@ -173,10 +173,10 @@ public class IOSLauncher extends IOSApplication.Delegate{
ui.load.runLoadSave(slot); ui.load.runLoadSave(slot);
} }
}catch(IOException e){ }catch(IOException e){
ui.showException("save.import.fail", e); ui.showException("$save.import.fail", e);
} }
}else{ }else{
ui.showErrorMessage("save.import.invalid"); ui.showErrorMessage("$save.import.invalid");
} }
} }