From 7cb301e3b007298856c0c2d55c3d375bdb11c3f6 Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Sun, 12 Jan 2014 19:52:33 +0530 Subject: [PATCH] load prev save better --- pdex/src/processing/mode/experimental/AutoSaveUtil.java | 7 ++++--- pdex/src/processing/mode/experimental/DebugEditor.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pdex/src/processing/mode/experimental/AutoSaveUtil.java b/pdex/src/processing/mode/experimental/AutoSaveUtil.java index 35e783534..7120144f7 100644 --- a/pdex/src/processing/mode/experimental/AutoSaveUtil.java +++ b/pdex/src/processing/mode/experimental/AutoSaveUtil.java @@ -41,7 +41,8 @@ public class AutoSaveUtil { if(autosaveDir.exists()){ String prevSaves[] = Base.listFiles(autosaveDir, false); if(prevSaves.length > 0){ - pastSave = new File(prevSaves[0]); + File t = new File(Base.listFiles(new File(prevSaves[0]), false)[0]); + pastSave = new File(t.getAbsolutePath() + File.separator + t.getName() + ".pde"); return true; } } @@ -62,8 +63,8 @@ public class AutoSaveUtil { public void stop(){ while(isSaving); // save operation mustn't be interrupted - timer.cancel(); - Base.removeDir(autosaveDir); + if(timer != null) timer.cancel(); + //Base.removeDir(autosaveDir); } private boolean saveSketch() throws IOException{ diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java index 2cd201bff..c4a16a586 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -883,10 +883,10 @@ public class DebugEditor extends JavaEditor implements ActionListener { "Select YES to view it or NO to delete the backup."); if(response == JOptionPane.YES_OPTION){ handleOpenInternal(pastSave.getAbsolutePath()); + //log(getSketch().getMainFilePath()); + autosaver = new AutoSaveUtil(this, 5); } - else{ - autosaver.init(); - } + autosaver.init(); } /**