From b794c833f510cbde66c30aa75926da58594d55c2 Mon Sep 17 00:00:00 2001 From: Michael Reeves Date: Fri, 29 Mar 2019 09:10:59 -0400 Subject: [PATCH] set Directory compare flag when passed parameters --- src/kdiff3.cpp | 4 +++- src/main.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 276d7f6..74ca65e 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -266,7 +266,9 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P if(args.count() > 0) m_sd2.setFilename(args[0]); if(args.count() > 1) m_sd3.setFilename(args[1]); } - //never properly defined and redundant + //Set m_bDirCompare flag + m_bDirCompare = FileAccess(m_sd1.getFilename()).isDir(); + QStringList aliasList; //KDiff3Shell::getParser()->values( "fname" ); QStringList::Iterator ali = aliasList.begin(); diff --git a/src/main.cpp b/src/main.cpp index b1021a6..ff1e5a0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -144,7 +144,7 @@ int main(int argc, char* argv[]) else { /* - There is no terminal connected so don't just exit mysteriously exit on error. + There is no terminal connected so don't just exit mysteriously on error. */ if(!cmdLineParser->parse(QCoreApplication::arguments())) { -- GitLab