Commit 3a18878b authored by Patrick J.P's avatar Patrick J.P

videonode: Do not finish if material is different

Fix bluerobotics/qgroundcontrol#164
Signed-off-by: 's avatarPatrick J.P <patrickelectric@gmail.com>
parent 83030ca6
...@@ -52,14 +52,18 @@ void VideoNode::setMaterialTypeSolidBlack() ...@@ -52,14 +52,18 @@ void VideoNode::setMaterialTypeSolidBlack()
void VideoNode::setCurrentFrame(GstBuffer* buffer) void VideoNode::setCurrentFrame(GstBuffer* buffer)
{ {
Q_ASSERT (m_materialType == MaterialTypeVideo); if (m_materialType != MaterialTypeVideo) {
return;
}
static_cast<VideoMaterial*>(material())->setCurrentFrame(buffer); static_cast<VideoMaterial*>(material())->setCurrentFrame(buffer);
markDirty(DirtyMaterial); markDirty(DirtyMaterial);
} }
void VideoNode::updateColors(int brightness, int contrast, int hue, int saturation) 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); static_cast<VideoMaterial*>(material())->updateColors(brightness, contrast, hue, saturation);
markDirty(DirtyMaterial); markDirty(DirtyMaterial);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment