From 15f0488d1c8ca4816672470591627cba7108ea0e Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Wed, 9 Nov 2016 21:25:28 -0500 Subject: [PATCH] remove old debug folder, other cleanups --- app/src/processing/app/Base.java | 8 ++++++-- build/build.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 4bb8668de..d11284901 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -142,8 +142,12 @@ public class Base { // Set the debug flag based on a file being present in the settings folder File debugFile = getSettingsFile("debug"); - // if it's a directory, it's a leftover from older releases - DEBUG = debugFile.exists() && !debugFile.isDirectory(); + if (debugFile.isDirectory()) { + // if it's a directory, it's a leftover from older releases, clear it + Util.removeDir(debugFile); + } else if (debugFile.exists()) { + DEBUG = true; + } // Use native popups so they don't look so crappy on OS X JPopupMenu.setDefaultLightWeightPopupEnabled(false); diff --git a/build/build.xml b/build/build.xml index 7238516e4..adc15e658 100644 --- a/build/build.xml +++ b/build/build.xml @@ -387,7 +387,7 @@ - +