Browse Source

Fixed null-pointer issue for remote target if no MAV is connected

QGC4.4
lm 15 years ago
parent
commit
4498702627
  1. 4
      src/ui/map3D/QMap3DWidget.cc

4
src/ui/map3D/QMap3DWidget.cc

@ -268,7 +268,7 @@ QMap3DWidget::mouseHandler(Qt::MouseButton button, MouseState state,
if (button == Qt::RightButton && state == MOUSE_STATE_DOWN) if (button == Qt::RightButton && state == MOUSE_STATE_DOWN)
{ {
QMenu menu(this); QMenu menu(this);
QAction* targetAction = menu.addAction("Mark as Target"); QAction* targetAction = menu.addAction(tr("Mark as Target"));
connect(targetAction, SIGNAL(triggered()), this, SLOT(markTarget())); connect(targetAction, SIGNAL(triggered()), this, SLOT(markTarget()));
menu.exec(mapToGlobal(QPoint(x, y))); menu.exec(mapToGlobal(QPoint(x, y)));
} }
@ -339,7 +339,7 @@ QMap3DWidget::markTarget(void)
displayTarget = true; displayTarget = true;
uas->setTargetPosition(targetPosition.x, targetPosition.y, if (uas) uas->setTargetPosition(targetPosition.x, targetPosition.y,
targetPosition.z, 0.0f); targetPosition.z, 0.0f);
} }

Loading…
Cancel
Save