Fix crash on unknown command

e2bd53d4 · Don Gagne · e1a686b7 · e2bd53d4
Commit e2bd53d4 authored Aug 20, 2016 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

MissionCommandTree.cc src/MissionManager/MissionCommandTree.cc +10 -2

No files found.
--- 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<MAV_CMD>& MissionCommandTree::allCommandIds(void) const