Merge pull request #6365 from bluerobotics/patrickelectric/fix#164

Perfect. Thanks!

Merge pull request #6365 from bluerobotics/patrickelectric/fix#164
Perfect. Thanks!
53e4da0a · Gus Grubba · GitHub · c29c83a9 · 3a18878b · 53e4da0a
Unverified Commit 53e4da0a authored Apr 18, 2018 by Gus Grubba Committed by GitHub Apr 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

videonode.cpp src/VideoStreaming/gstqtvideosink/painters/videonode.cpp +6 -2

No files found.
--- a/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp
+++ b/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp
@@ -52,14 +52,18 @@ void VideoNode::setMaterialTypeSolidBlack()

 void VideoNode::setCurrentFrame(GstBuffer* buffer)
 {
-    Q_ASSERT (m_materialType == MaterialTypeVideo);
+    if (m_materialType != MaterialTypeVideo) {
+        return;
+    }
    static_cast<VideoMaterial*>(material())->setCurrentFrame(buffer);
    markDirty(DirtyMaterial);
 }

 void VideoNode::updateColors(int brightness, int contrast, int hue, int saturation)
 {
-    Q_ASSERT (m_materialType == MaterialTypeVideo);
+    if (m_materialType != MaterialTypeVideo) {
+        return;
+    }
    static_cast<VideoMaterial*>(material())->updateColors(brightness, contrast, hue, saturation);
    markDirty(DirtyMaterial);
 }