Commit dda783ff authored by Don Gagne's avatar Don Gagne

commit

parent c8c3290e
...@@ -574,6 +574,7 @@ bool QGCFlightGearLink::parseUIArguments(QString uiArgs, QStringList& argList) ...@@ -574,6 +574,7 @@ bool QGCFlightGearLink::parseUIArguments(QString uiArgs, QStringList& argList)
/// @param argLabel Argument label to search for /// @param argLabel Argument label to search for
/// @param argValue Returned argument value if found /// @param argValue Returned argument value if found
/// @return Returns true if argument found and argValue returned /// @return Returns true if argument found and argValue returned
bool QGCFlightGearLink::_findUIArgument(const QStringList& uiArgList, const QString& argLabel, QString& argValue) bool QGCFlightGearLink::_findUIArgument(const QStringList& uiArgList, const QString& argLabel, QString& argValue)
{ {
QString regExpStr = argLabel + "=(.*)"; QString regExpStr = argLabel + "=(.*)";
...@@ -703,8 +704,8 @@ bool QGCFlightGearLink::connectSimulation() ...@@ -703,8 +704,8 @@ bool QGCFlightGearLink::connectSimulation()
#error Unknown OS build flavor #error Unknown OS build flavor
#endif #endif
// Validate the FlightGear application directory location. Linux runs from path so we don't validate on that OS.
#ifndef Q_OS_LINUX #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()); Q_ASSERT(!fgAppName.isEmpty());
QString fgAppFullyQualified = fgAppDir.absoluteFilePath(fgAppName); QString fgAppFullyQualified = fgAppDir.absoluteFilePath(fgAppName);
while (!QFileInfo(fgAppFullyQualified).exists()) { while (!QFileInfo(fgAppFullyQualified).exists()) {
...@@ -744,7 +745,7 @@ bool QGCFlightGearLink::connectSimulation() ...@@ -744,7 +745,7 @@ bool QGCFlightGearLink::connectSimulation()
#endif #endif
_fgArgList += uiArgList; _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. // proposed locations.
QString argValue; QString argValue;
fgRootDirOverride = _findUIArgument(_fgArgList, "--fg-root", argValue); fgRootDirOverride = _findUIArgument(_fgArgList, "--fg-root", argValue);
......
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