Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
dda783ff
Commit
dda783ff
authored
Jun 06, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit
parent
c8c3290e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+3
-2
No files found.
src/comm/QGCFlightGearLink.cc
View file @
dda783ff
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment