summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli.qt@gmail.com>2020-02-12 22:56:54 +0100
committerpaolo <paolo.angelelli.qt@gmail.com>2020-02-13 15:15:37 +0100
commit0ace8d20dcdbcc281c7ebc48b0c153170ebd99b0 (patch)
tree8868a70d7af2de759d2566c248cda37bfd1e7e18
parentbe7cbed7411d024d178377bd327d5916c80e02a0 (diff)
downloadqtlocation-0ace8d20dcdbcc281c7ebc48b0c153170ebd99b0.tar.gz
Fix crash with empty maps on construction
Change-Id: I8716c94b2c3f1fb995e933fe5be736e94ff161ce Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/labs/qsg/qgeomapobjectqsgsupport.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
index f965efb7..0e1df8f6 100644
--- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
@@ -155,6 +155,8 @@ void QGeoMapObjectQSGSupport::removeMapObject(QGeoMapObject *obj)
// called in the render thread
void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *window)
{
+ if (!root)
+ return;
if (!m_mapObjectsRootNode) {
m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode();
root->appendChildNode(m_mapObjectsRootNode);