From e2bd53d4625c437e7661a54fc53ca678c5a2e8d2 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Aug 2016 19:16:33 -0700 Subject: [PATCH] Fix crash on unknown command --- src/MissionManager/MissionCommandTree.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc index 06f8c5e04..2c6e4fed8 100644 --- a/src/MissionManager/MissionCommandTree.cc +++ b/src/MissionManager/MissionCommandTree.cc @@ -174,7 +174,11 @@ QString MissionCommandTree::friendlyName(MAV_CMD command) MissionCommandList * commandList = _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC]; MissionCommandUIInfo* uiInfo = commandList->getUIInfo(command); - return uiInfo->friendlyName(); + if (uiInfo) { + return uiInfo->friendlyName(); + } else { + return QString("MAV_CMD(%1)").arg((int)command); + } } QString MissionCommandTree::rawName(MAV_CMD command) @@ -182,7 +186,11 @@ QString MissionCommandTree::rawName(MAV_CMD command) MissionCommandList * commandList = _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC]; MissionCommandUIInfo* uiInfo = commandList->getUIInfo(command); - return uiInfo->rawName(); + if (uiInfo) { + return uiInfo->rawName(); + } else { + return QString("MAV_CMD(%1)").arg((int)command); + } } const QList& MissionCommandTree::allCommandIds(void) const -- 2.22.0