LP-109 fix crash when using PFD Video without gstreamer support

filnet · filnet · commit f78d161dc3ac · 2017-09-12T22:21:17.000+02:00
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp
@@ -84,7 +84,7 @@ struct OSGImageNode::Hidden : public QObject {
                 imageSource = new ImageSource();
             }
         }
-        return imageSource->createImage(imageUrl);
+        return imageSource ? imageSource->createImage(imageUrl) : 0;
     }
 
     void updateImageFile()
@@ -96,8 +96,12 @@ struct OSGImageNode::Hidden : public QObject {
     {
         osg::Image *image = loadImage();
 
+        if (!image) {
+            return;
+        }
+
         // qDebug() << "OSGImageNode::update" << image;
-        osg::Node *geode  = createGeodeForImage(image);
+        osg::Node *geode = createGeodeForImage(image);
 
         self->setNode(geode);
     }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ struct OSGImageNode::Hidden : public QObject {`
`84`	`84`	`imageSource = new ImageSource();`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`- return imageSource->createImage(imageUrl);`
	`87`	`+ return imageSource ? imageSource->createImage(imageUrl) : 0;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void updateImageFile()`
`@@ -96,8 +96,12 @@ struct OSGImageNode::Hidden : public QObject {`
`96`	`96`	`{`
`97`	`97`	`osg::Image *image = loadImage();`
`98`	`98`
	`99`	`+ if (!image) {`
	`100`	`+ return;`
	`101`	`+ }`
	`102`	`+`
`99`	`103`	`// qDebug() << "OSGImageNode::update" << image;`
`100`		`- osg::Node *geode = createGeodeForImage(image);`
	`104`	`+ osg::Node *geode = createGeodeForImage(image);`
`101`	`105`
`102`	`106`	`self->setNode(geode);`
`103`	`107`	`}`