Commit b794c833 authored by Michael Reeves's avatar Michael Reeves

set Directory compare flag when passed parameters

parent 5ac57037
...@@ -266,7 +266,9 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P ...@@ -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() > 0) m_sd2.setFilename(args[0]);
if(args.count() > 1) m_sd3.setFilename(args[1]); 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 aliasList; //KDiff3Shell::getParser()->values( "fname" );
QStringList::Iterator ali = aliasList.begin(); QStringList::Iterator ali = aliasList.begin();
......
...@@ -144,7 +144,7 @@ int main(int argc, char* argv[]) ...@@ -144,7 +144,7 @@ int main(int argc, char* argv[])
else 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())) if(!cmdLineParser->parse(QCoreApplication::arguments()))
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment