diff hgrunner.cpp @ 217:18bac9a34d58

Merge
author Chris Cannam
date Wed, 05 Jan 2011 16:09:23 +0000
parents 90e70a9024f3
children e2f2c6e3c01b
line wrap: on
line diff
--- 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;