eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4204 from jdf/master

Browse Source 
Fix crashing bugs that happen when the user's name has non-ASCII characters on Windows.
This commit is contained in:
Ben Fry
2016-02-13 19:45:11 -05:00
parent d3f63ac7ee cba0e4558e
commit 9df2019f55
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/Platform.java
+6 -5
View File
@@ -286,13 +286,13 @@ public class Platform {
String decodedPath = PApplet.urlDecode(path);
if (decodedPath.contains("/app/bin")) { // This means we're in Eclipse
final File build = new File(decodedPath, "../../build").getAbsoluteFile();
if (Platform.isMacOS()) {
processingRoot =
new File(path, "../../build/macosx/work/Processing.app/Contents/Java");
processingRoot = new File(build, "macosx/work/Processing.app/Contents/Java");
} else if (Platform.isWindows()) {
processingRoot = new File(path, "../../build/windows/work");
processingRoot = new File(build, "windows/work");
} else if (Platform.isLinux()) {
processingRoot = new File(path, "../../build/linux/work");
processingRoot = new File(build, "linux/work");
}
} else {
// The .jar file will be in the lib folder
@@ -311,7 +311,8 @@ public class Platform {
System.err.println("Could not find lib folder via " +
jarFolder.getAbsolutePath() +
", switching to user.dir");
processingRoot = new File(System.getProperty("user.dir"));
final String userDir = System.getProperty("user.dir");
processingRoot = new File(PApplet.urlDecode(userDir));
}
}
}