[sikuli] 163/385: fixed a problem when refusing to save the undefined tab on close (answer NO)

[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 9eea7017559de20b1650b209a27f18c7b8a436e8
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Jan 16 15:02:43 2014 +0100

    fixed a problem when refusing to save the undefined tab on close (answer NO)
---
 API/src/main/java/org/sikuli/script/ImagePath.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/API/src/main/java/org/sikuli/script/ImagePath.java b/API/src/main/java/org/sikuli/script/ImagePath.java
index 70ea246..92e50ce 100644
--- a/API/src/main/java/org/sikuli/script/ImagePath.java
+++ b/API/src/main/java/org/sikuli/script/ImagePath.java
@@ -233,7 +233,7 @@ public class ImagePath {
    */
   public static boolean add(String mainPath, String altPath) {
     PathEntry path = makePathURL(mainPath, altPath);
-    if (path != null) {
+    if (path.pathGiven != null) {
       if (hasPath(path.pathURL) < 0) {
         log(lvl, "add: %s", path.pathURL);
         imagePaths.add(path);
@@ -355,7 +355,7 @@ public class ImagePath {
   public static boolean setBundlePath(String bundlePath) {
     if (bundlePath != null && !bundlePath.isEmpty()) {
       PathEntry path = makePathURL(bundlePath, null);
-      if (path != null && "file".equals(path.pathURL.getProtocol())) {
+      if (path.pathGiven != null && "file".equals(path.pathURL.getProtocol())) {
         if (new File(new File(path.pathURL.getPath()).getAbsolutePath()).exists()) {
           imagePaths.set(0, path);
           Settings.BundlePath = path.pathURL.getPath();
@@ -413,7 +413,7 @@ public class ImagePath {
         mainPath = FileManager.slashify(mainPath, true);
         return new PathEntry(mainPath, FileManager.makeURL(mainPath));
       } else {
-        return null;
+        return new PathEntry(null, FileManager.makeURL(mainPath));
       }
     }
     Class cls = null;

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