Skip to content

Commit 8660f0a

Browse files
committed
Revert "Added settings override"
This reverts commit 387aa8e.
1 parent 387aa8e commit 8660f0a

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

app/src/processing/app/Base.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,10 +2221,7 @@ static public File getSettingsFolder() {
22212221

22222222
try {
22232223
settingsFolder = Platform.getSettingsFolder();
2224-
var settingsOverride = System.getProperty("processing.settings.folder");
2225-
if (settingsOverride != null && !settingsOverride.isEmpty()) {
2226-
settingsFolder = new File(settingsOverride);
2227-
}
2224+
22282225
// create the folder if it doesn't exist already
22292226
if (!settingsFolder.exists()) {
22302227
if (!settingsFolder.mkdirs()) {

app/test/processing/app/SketchbookTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,9 @@ class SketchbookTest {
1313
@Test
1414
fun sketchbookIsOverridableTest() {
1515
val directory = createTempDirectory("scaffolding")
16-
val preferences = directory.resolve("preferences")
17-
preferences.toFile().mkdirs()
1816
val sketchbook = directory.resolve("sketchbook")
1917
sketchbook.toFile().mkdirs()
20-
2118
System.setProperty("processing.sketchbook.folder", sketchbook.toAbsolutePath().toString())
22-
System.setProperty("processing.settings.folder", preferences.toAbsolutePath().toString())
2319

2420
val result = Base.getSketchbookFolder()
2521
assert(result.absolutePath == sketchbook.toAbsolutePath().toString())

0 commit comments

Comments
 (0)