From e224698ecf43a2184d3ea037382257ecfbf31130 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 30 Nov 2015 10:17:29 +0100
Subject: [PATCH] Files weren't deleted from temp unsaved sketch folder. Fixes
 #4233

---
 app/src/processing/app/Sketch.java              | 2 +-
 arduino-core/src/processing/app/SketchCode.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index f5adfdede..aa2c8c719 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -463,7 +463,7 @@ public class Sketch {
 
       } else {
         // delete the file
-        if (!current.getCode().deleteFile(BaseNoGui.getBuildFolder(data))) {
+        if (!current.getCode().deleteFile(BaseNoGui.getBuildFolder(data).toPath(), Paths.get(System.getProperty("java.io.tmpdir"), "arduino_" + DigestUtils.md5Hex(getMainFilePath())))) {
           Base.showMessage(tr("Couldn't do it"),
                            I18n.format(tr("Could not delete \"{0}\"."), current.getCode().getFileName()));
           return;
diff --git a/arduino-core/src/processing/app/SketchCode.java b/arduino-core/src/processing/app/SketchCode.java
index 54d070775..88d2a5196 100644
--- a/arduino-core/src/processing/app/SketchCode.java
+++ b/arduino-core/src/processing/app/SketchCode.java
@@ -91,12 +91,12 @@ public class SketchCode {
   }
 
 
-  protected boolean deleteFile(File tempBuildFolder) throws IOException {
+  protected boolean deleteFile(Path tempBuildFolder, Path tempUnsavedSketchPath) throws IOException {
     if (!file.delete()) {
       return false;
     }
 
-    List<Path> tempBuildFolders = Stream.of(tempBuildFolder.toPath(), Paths.get(tempBuildFolder.getAbsolutePath(), "sketch"))
+    List<Path> tempBuildFolders = Stream.of(tempBuildFolder, tempBuildFolder.resolve("sketch"), tempUnsavedSketchPath)
       .filter(path -> Files.exists(path))
       .collect(Collectors.toList());