summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-01 19:14:44 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-01 19:15:08 (GMT)
commit4a3f660b885f5ba9eb606859ece709189e2189b4 (patch)
treed527dbef353f75cea9962b7254e043eba4518433
parentd56831ea499f82c4e604d2b39aa855781c66b9ee (diff)
Fix blank screen on movit pause
CCBUG: 371926
-rw-r--r--src/monitor/glwidget.cpp2
-rw-r--r--src/renderer.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/monitor/glwidget.cpp b/src/monitor/glwidget.cpp
index 0ccc2b0..6c4427a 100644
--- a/src/monitor/glwidget.cpp
+++ b/src/monitor/glwidget.cpp
@@ -395,6 +395,7 @@ void GLWidget::releaseAnalyse()
void GLWidget::paintGL()
{
+ if (m_glslManager && !m_texture[0]) return;
QOpenGLFunctions* f = openglContext()->functions();
int width = this->width() * devicePixelRatio();
int height = this->height() * devicePixelRatio();
@@ -420,7 +421,6 @@ void GLWidget::paintGL()
m_mutex.unlock();
}
#endif
- if (!m_texture[0]) return;
// Bind textures.
for (int i = 0; i < 3; ++i) {
diff --git a/src/renderer.cpp b/src/renderer.cpp
index ca9e32b..6902d23 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -948,7 +948,6 @@ bool Render::checkFrameNumber(int pos)
} else {
m_isRefreshing = false;
if (m_mltProducer->get_speed() == 0) {
- m_mltConsumer->stop();
m_mltConsumer->purge();
} else if (m_isZoneMode) {
if (pos >= m_mltProducer->get_int("out") - 1) {