Refactored Base.getDefaultSketchbookFolder() method.

Author: bitron

app/src/processing/app/Base.java

@@ -222,7 +222,7 @@ public Base(String[] args) throws Exception {
 
     // If no path is set, get the default sketchbook folder for this platform
     if (sketchbookPath == null) {
-      File defaultFolder = getDefaultSketchbookFolder();
+      File defaultFolder = getDefaultSketchbookFolderOrPromptForIt();
       if (BaseNoGui.getPortableFolder() != null)
         Preferences.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder());
       else
@@ -1896,6 +1896,14 @@ protected File getDefaultSketchbookFolder() {
       sketchbookFolder = getPlatform().getDefaultSketchbookFolder();
     } catch (Exception e) { }
 
+    return sketchbookFolder;
+  }
+
+
+  protected File getDefaultSketchbookFolderOrPromptForIt() {
+
+    File sketchbookFolder = getDefaultSketchbookFolder();
+
     if (sketchbookFolder == null) {
       sketchbookFolder = promptSketchbookLocation();
     }

app/src/processing/app/Preferences.java

@@ -578,7 +578,7 @@ protected void applyFrame() {
     String newPath = sketchbookLocationField.getText();
     if (newPath.isEmpty()) {
       if (Base.getPortableFolder() == null)
-        newPath = editor.base.getDefaultSketchbookFolder().toString();
+        newPath = editor.base.getDefaultSketchbookFolderOrPromptForIt().toString();
       else
         newPath = Base.getPortableSketchbookFolder();
     }