summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@theqtcompany.com>2016-07-21 13:13:07 +0200
committerPaolo Angelelli <paolo.angelelli@theqtcompany.com>2016-07-26 13:20:40 +0000
commit5adda3e6651f3d45838ece962a4ae656eac5af04 (patch)
tree04473a298faabc3b96adcc451038f8aa18c63a4a
parentfc30c6d011f705ae8b56f8703757be0d7375e1bf (diff)
downloadqtlocation-5adda3e6651f3d45838ece962a4ae656eac5af04.tar.gz
Fix for qgeocirclemapitem generation with invalid radius
this patch adds a validity check on radius_ before proceeding to updatePolish() Task-number: QTBUG-19929 Change-Id: I4a1d79761b77ed27846be249c685ad94dc47a028 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r--src/imports/location/qdeclarativecirclemapitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp
index eb3de7a2..1a5b8125 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/imports/location/qdeclarativecirclemapitem.cpp
@@ -452,7 +452,7 @@ QSGNode *QDeclarativeCircleMapItem::updateMapItemPaintNode(QSGNode *oldNode, Upd
*/
void QDeclarativeCircleMapItem::updatePolish()
{
- if (!map() || !center().isValid())
+ if (!map() || !center().isValid() || qIsNaN(radius_) || radius_ <= 0.0)
return;
QScopedValueRollback<bool> rollback(updatingGeometry_);