# HG changeset patch
# User Chris Cannam
# Date 1294243763 0
# Node ID 18bac9a34d58c997eca136562e0495a34e0918ca
# Parent  27bfdc28541efcc8e929bc60c58024f74da2862e# Parent  90e70a9024f37204a859f08c3d6347e10c1f15f8
Merge

diff -r 27bfdc28541e -r 18bac9a34d58 common.cpp
--- a/common.cpp	Wed Jan 05 15:58:58 2011 +0000
+++ b/common.cpp	Wed Jan 05 16:09:23 2011 +0000
@@ -97,7 +97,11 @@
         }
     }
 #endif
-    return name;
+    if (found) {
+        return name;
+    } else {
+        return "";
+    }
 }
 
 #ifdef Q_OS_WIN32
diff -r 27bfdc28541e -r 18bac9a34d58 hgrunner.cpp
--- a/hgrunner.cpp	Wed Jan 05 15:58:58 2011 +0000
+++ b/hgrunner.cpp	Wed Jan 05 16:09:23 2011 +0000
@@ -83,9 +83,6 @@
     extpath = unbundled;
     if (extpath == "") {
         extpath = findInPath("easyhg.py", m_myDirPath, false);
-        if (extpath == "easyhg.py") {
-            extpath = "";
-        }
     }
 
     settings.setValue("extensionpath", extpath);
@@ -186,7 +183,7 @@
     if (hg == "") {
         hg = findInPath("hg", m_myDirPath, true);
     }
-    if (hg != "hg") {
+    if (hg != "") {
         settings.setValue("hgbinary", hg);
     }
     return hg;
diff -r 27bfdc28541e -r 18bac9a34d58 mainwindow.cpp
--- a/mainwindow.cpp	Wed Jan 05 15:58:58 2011 +0000
+++ b/mainwindow.cpp	Wed Jan 05 16:09:23 2011 +0000
@@ -512,7 +512,7 @@
         bool found = false;
         foreach (QString base, bases) {
             diff = findInPath(base, m_myDirPath, true);
-            if (diff != base && diff != base + ".exe") {
+            if (diff != "") {
                 found = true;
                 break;
             }
@@ -543,7 +543,7 @@
     bool found = false;
     foreach (QString base, bases) {
         merge = findInPath(base, m_myDirPath, true);
-        if (merge != base && merge != base + ".exe") {
+        if (merge != "") {
             found = true;
             break;
         }
@@ -577,7 +577,7 @@
         bool found = false;
         foreach (QString base, bases) {
             editor = findInPath(base, m_myDirPath, true);
-            if (editor != base && editor != base + ".exe") {
+            if (editor != "") {
                 found = true;
                 break;
             }