comparison mainwindow.cpp @ 177:bb89bcd8986b

* Fixes to external program location logic on Win32
author Chris Cannam
date Thu, 16 Dec 2010 20:23:43 +0000
parents 6def8bf3be44
children 1a3af8617ea4
comparison
equal deleted inserted replaced
176:a6ec8d0bdd34 177:bb89bcd8986b
409 QStringList bases; 409 QStringList bases;
410 bases << "opendiff" << "kompare" << "kdiff3" << "meld"; 410 bases << "opendiff" << "kompare" << "kdiff3" << "meld";
411 bool found = false; 411 bool found = false;
412 foreach (QString base, bases) { 412 foreach (QString base, bases) {
413 diff = findInPath(base, m_myDirPath, true); 413 diff = findInPath(base, m_myDirPath, true);
414 if (diff != base) { 414 if (diff != base && diff != base + ".exe") {
415 found = true; 415 found = true;
416 break; 416 break;
417 } 417 }
418 } 418 }
419 if (found) { 419 if (found) {