Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0aff4103
Commit
0aff4103
authored
Nov 01, 2015
by
Andreas Antener
Browse files
check for new and old flightgear path
parent
b723939a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/comm/QGCFlightGearLink.cc
View file @
0aff4103
...
...
@@ -133,7 +133,7 @@ void QGCFlightGearLink::run()
// On Windows we need to full qualify the location of the excecutable. The call to setWorkingDirectory only
// sets the QProcess context, not the QProcess::start context. For some strange reason this is not the case on
// OSX.
QDir
fgProcessFullyQualified
(
_fgProcessWorkingDirPath
);
QDir
fgProcessFullyQualified
(
_fgProcessWorkingDirPath
);
_fgProcessName
=
fgProcessFullyQualified
.
absoluteFilePath
(
_fgProcessName
);
#endif
...
...
@@ -663,8 +663,14 @@ bool QGCFlightGearLink::connectSimulation()
// that is pretty non-standard so we don't try to get fancy beyond hardcoding that path.
fgAppDir
.
setPath
(
"/Applications"
);
fgAppName
=
"FlightGear.app"
;
// new path
_fgProcessName
=
"./fgfs"
;
_fgProcessWorkingDirPath
=
"/Applications/FlightGear.app/Contents/MacOS/"
;
if
(
!
QFileInfo
(
_fgProcessWorkingDirPath
+
_fgProcessName
).
exists
()){
// old path
_fgProcessName
=
"./fgfs.sh"
;
_fgProcessWorkingDirPath
=
"/Applications/FlightGear.app/Contents/Resources/"
;
}
fgRootPathProposedList
+=
"/Applications/FlightGear.app/Contents/Resources/data/"
;
#elif defined Q_OS_WIN32
_fgProcessName
=
"fgfs.exe"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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