Mercurial > hg > easyhg
diff mainwindow.cpp @ 217:18bac9a34d58
Merge
author | Chris Cannam |
---|---|
date | Wed, 05 Jan 2011 16:09:23 +0000 |
parents | 90e70a9024f3 |
children | cb8ccbff8f84 05255f23f2af |
line wrap: on
line diff
--- 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; }