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
427ad724
Commit
427ad724
authored
Feb 12, 2016
by
Don Gagne
Browse files
Merge pull request #2782 from DonLakeFlyer/VehicleCrash
Fix vehicle switch crash
parents
4aff4121
992b3a5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/MissionManager/MissionCommands.cc
View file @
427ad724
...
...
@@ -150,17 +150,17 @@ MavCmdInfo* MissionCommands::getMavCmdInfo(MAV_CMD command, Vehicle* vehicle) co
if
(
vehicle
)
{
if
(
vehicle
->
fixedWing
())
{
if
(
_autopilotToFixedWingMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
if
(
_autopilotToFixedWingMissionCommands
.
contains
(
firmwareType
)
&&
_autopilotToFixedWingMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToFixedWingMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
}
else
if
(
vehicle
->
multiRotor
())
{
if
(
_autopilotToMultiRotorMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
if
(
_autopilotToMultiRotorMissionCommands
.
contains
(
firmwareType
)
&&
_autopilotToMultiRotorMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToMultiRotorMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
}
}
if
(
!
mavCmdInfo
&&
_autopilotToCommonMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
if
(
!
mavCmdInfo
&&
_autopilotToCommonMissionCommands
.
contains
(
firmwareType
)
&&
_autopilotToCommonMissionCommands
[
firmwareType
]
->
contains
(
command
))
{
mavCmdInfo
=
_autopilotToCommonMissionCommands
[
firmwareType
]
->
getMavCmdInfo
(
command
);
}
...
...
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