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

Fixed crash report displaying location incorrectly

Browse Source
This commit is contained in:
Anuken
2018-07-14 17:00:33 -04:00
parent dfed36748c
commit 1aa4b8cb88
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
View File

@@ -5,7 +5,6 @@ import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -41,7 +40,7 @@ public class CrashHandler{
header += "OS: " + System.getProperty("os.name") + "\n"; header += "OS: " + System.getProperty("os.name") + "\n";
header += "Multithreading: " + Settings.getBool("multithread") + "\n----\n"; header += "Multithreading: " + Settings.getBool("multithread") + "\n----\n";
}catch(Throwable e4){ }catch(Throwable e4){
header += "\n--error getting additional info--\n"; header += "--error getting additional info--\n";
e4.printStackTrace(); e4.printStackTrace();
} }
@@ -54,7 +53,7 @@ public class CrashHandler{
//try to write it //try to write it
try{ try{
filename = "crash-report-" + new SimpleDateFormat("dd-MM-yy h.mm.ss").format(new Date()) + ".txt"; filename = "crash-report-" + new SimpleDateFormat("dd-MM-yy h.mm.ss").format(new Date()) + ".txt";
Files.write(Paths.get(System.getProperty("user.home"), "mindustry-crash-reports", filename), result.getBytes()); Files.write(Paths.get(System.getProperty("user.home"), filename), result.getBytes());
}catch(Throwable i){ }catch(Throwable i){
i.printStackTrace(); i.printStackTrace();
failed = true; failed = true;
@@ -62,7 +61,7 @@ public class CrashHandler{
try{ try{
javax.swing.JOptionPane.showMessageDialog(null, "An error has occured: \n" + result + "\n\n" + javax.swing.JOptionPane.showMessageDialog(null, "An error has occured: \n" + result + "\n\n" +
(!failed ? "A crash report has been written to " + new File(filename).getAbsolutePath() + ".\nPlease send this file to the developer!" (!failed ? "A crash report has been written to " + Paths.get(System.getProperty("user.home"), filename).toFile().getAbsolutePath() + ".\nPlease send this file to the developer!"
: "Failed to generate crash report.\nPlease send an image of this crash log to the developer!")); : "Failed to generate crash report.\nPlease send an image of this crash log to the developer!"));
}catch(Throwable i){ }catch(Throwable i){
i.printStackTrace(); i.printStackTrace();