From ff5a3fe3d12e8fd5e356e7726ce2048345db6203 Mon Sep 17 00:00:00 2001 From: Anton Babushkin Date: Sun, 8 Dec 2013 13:23:11 +0400 Subject: [PATCH] Fix crash when acceptance in pixels == 0 --- src/ui/map/Waypoint2DIcon.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ui/map/Waypoint2DIcon.cc b/src/ui/map/Waypoint2DIcon.cc index 3bf54232f..83aad5b51 100644 --- a/src/ui/map/Waypoint2DIcon.cc +++ b/src/ui/map/Waypoint2DIcon.cc @@ -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))) { -- 2.22.0