From 26a8b37d186135c02676504ac3aba7a1fce7d190 Mon Sep 17 00:00:00 2001
From: Claudio Indellicati <bitron.it@gmail.com>
Date: Tue, 26 Aug 2014 12:14:24 +0200
Subject: [PATCH] Refactored Base.getDefaultSketchbookFolder() method.

---
 app/src/processing/app/Base.java        | 10 +++++++++-
 app/src/processing/app/Preferences.java |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 17379f43c..14691e0ee 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -222,7 +222,7 @@ public class Base {
 
     // 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 @@ public class Base {
       sketchbookFolder = getPlatform().getDefaultSketchbookFolder();
     } catch (Exception e) { }
 
+    return sketchbookFolder;
+  }
+
+
+  protected File getDefaultSketchbookFolderOrPromptForIt() {
+
+    File sketchbookFolder = getDefaultSketchbookFolder();
+
     if (sketchbookFolder == null) {
       sketchbookFolder = promptSketchbookLocation();
     }
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index e6c692568..421d9c1d4 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -578,7 +578,7 @@ public class Preferences {
     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();
     }