Skip to content

Q
qgroundcontrol
Commit c472a494 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge pull request #424 from DrTon/acceptance_fix 

Fix crash when acceptance in pixels == 0
parents 2f1d35c5 ff5a3fe3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/ui/map/Waypoint2DIcon.cc
View file @ c472a494
......@@ -291,10 +291,12 @@ void Waypoint2DIcon::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
redPen.setWidth(1);
painter->setPen(redPen);
const int acceptance = map->metersToPixels(waypoint->getAcceptanceRadius(), Coord());
painter->setPen(penBlack);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
painter->setPen(redPen);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
if (acceptance > 0) {
painter->setPen(penBlack);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
painter->setPen(redPen);
painter->drawEllipse(QPointF(0, 0), acceptance, acceptance);
}
}
if ((waypoint) && ((waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_UNLIM) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TIME) || (waypoint->getAction() == (int)MAV_CMD_NAV_LOITER_TURNS)))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment