Merge pull request processing#4204 from jdf/master

benfry · benfry · commit 42ee76b6ec87 · 2016-02-13T19:45:11.000-05:00
Fix crashing bugs that happen when the user's name has non-ASCII characters on Windows.
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
@@ -286,13 +286,13 @@ static public File getContentFile(String name) {
       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 @@ static public File getContentFile(String name) {
           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));
         }
       }
     }
