From 8c792fd0a6df7305eb51765cf5548511a2b9bb22 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Tue, 11 Feb 2014 23:55:33 -0800 Subject: [PATCH] Fix closing the render thread. This makes Windows happy when used in conjunction with qmelt. --- src/modules/qt/consumer_qglsl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp index a1fb9365..ee841e6b 100644 --- a/src/modules/qt/consumer_qglsl.cpp +++ b/src/modules/qt/consumer_qglsl.cpp @@ -105,10 +105,8 @@ public: } ~RenderThread() { -#ifndef Q_OS_WIN m_surface->destroy(); delete m_surface; -#endif } protected: @@ -142,6 +140,7 @@ static void onThreadJoin(mlt_properties owner, mlt_consumer self, RenderThread* Q_UNUSED(owner) Q_UNUSED(self) if (thread) { + thread->quit(); thread->wait(); qApp->processEvents(); delete thread; -- 2.39.2