From f78d161dc3ac3626b1cd7897362aac89fea5bdeb Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Tue, 12 Sep 2017 22:13:48 +0200 Subject: [PATCH] LP-109 fix crash when using PFD Video without gstreamer support --- ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp index 187efb931..f2e8712ca 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp @@ -84,7 +84,7 @@ public: imageSource = new ImageSource(); } } - return imageSource->createImage(imageUrl); + return imageSource ? imageSource->createImage(imageUrl) : 0; } void updateImageFile() @@ -96,8 +96,12 @@ public: { osg::Image *image = loadImage(); + if (!image) { + return; + } + // qDebug() << "OSGImageNode::update" << image; - osg::Node *geode = createGeodeForImage(image); + osg::Node *geode = createGeodeForImage(image); self->setNode(geode); }