[sikuli] 312/385: setup backup should persist for now, restore shoold only happen, if build_jar was successful

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 950d1260a9ca67f9481910505072dd4aa8368d7c
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Fri Feb 28 19:48:53 2014 +0100

    setup backup should persist for now, restore shoold only happen, if build_jar was successful
---
 Basics/src/main/java/org/sikuli/basics/RunSetup.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
index 9770091..fca8c3d 100644
--- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java
+++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java
@@ -918,7 +918,6 @@ public class RunSetup {
     //</editor-fold>
 
 		//<editor-fold defaultstate="collapsed" desc="option setup: add native stuff">
-		restore(); //to get back the stuff that was not changed
 		if (test && !popAsk("add native stuff --- proceed?")) {
 			System.exit(0);
 		}
@@ -1111,10 +1110,11 @@ public class RunSetup {
 			}
 			closeSplash(splash);
 		}
-		if (!success) {
+    if (!success) {
 			popError("Bad things happened trying to add native stuff to selected jars --- terminating!");
 			terminate("Adding stuff to jars did not work");
 		}
+		restore(); //to get back the stuff that was not changed
     //</editor-fold>
 
 		//<editor-fold defaultstate="collapsed" desc="option setup: environment setup and test">
@@ -1339,7 +1339,7 @@ public class RunSetup {
 			log1(lvl, "restoring from backup " + "folder " + folder);
 			new File(backup, folder).renameTo(new File(workDir, folder));
     }
-    FileManager.deleteFileOrFolder(new File(workDir, "Backup").getAbsolutePath());
+//    FileManager.deleteFileOrFolder(new File(workDir, "Backup").getAbsolutePath());
     FileManager.deleteFileOrFolder(new File(workDir, "SikuliPrefs.txt").getAbsolutePath());
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git