From dda783ff065c205d23bc63a864c82bb3cc00a851 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 6 Jun 2014 13:39:11 -0400 Subject: [PATCH] commit --- src/comm/QGCFlightGearLink.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc index 04cefb6..80e3208 100644 --- a/src/comm/QGCFlightGearLink.cc +++ b/src/comm/QGCFlightGearLink.cc @@ -574,6 +574,7 @@ bool QGCFlightGearLink::parseUIArguments(QString uiArgs, QStringList& argList) /// @param argLabel Argument label to search for /// @param argValue Returned argument value if found /// @return Returns true if argument found and argValue returned + bool QGCFlightGearLink::_findUIArgument(const QStringList& uiArgList, const QString& argLabel, QString& argValue) { QString regExpStr = argLabel + "=(.*)"; @@ -703,8 +704,8 @@ bool QGCFlightGearLink::connectSimulation() #error Unknown OS build flavor #endif - // Validate the FlightGear application directory location. Linux runs from path so we don't validate on that OS. #ifndef Q_OS_LINUX + // Validate the FlightGear application directory location. Linux runs from path so we don't validate on that OS. Q_ASSERT(!fgAppName.isEmpty()); QString fgAppFullyQualified = fgAppDir.absoluteFilePath(fgAppName); while (!QFileInfo(fgAppFullyQualified).exists()) { @@ -744,7 +745,7 @@ bool QGCFlightGearLink::connectSimulation() #endif _fgArgList += uiArgList; - // If we have an --fg-root coming in from the ui options that overrides any internal searching of + // If we have an --fg-root coming in from the ui options, that setting overrides any internal searching of // proposed locations. QString argValue; fgRootDirOverride = _findUIArgument(_fgArgList, "--fg-root", argValue);