From 3a18878b62924dd28b5def6aff1378a8c357e47f Mon Sep 17 00:00:00 2001 From: "Patrick J.P" Date: Tue, 17 Apr 2018 20:05:42 -0300 Subject: [PATCH] videonode: Do not finish if material is different Fix bluerobotics/qgroundcontrol#164 Signed-off-by: Patrick J.P --- src/VideoStreaming/gstqtvideosink/painters/videonode.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp b/src/VideoStreaming/gstqtvideosink/painters/videonode.cpp index 87b415c15..1a4cd1ab0 100644 --- 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(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(material())->updateColors(brightness, contrast, hue, saturation); markDirty(DirtyMaterial); } -- 2.22.0