From: Dan Dennedy <dan@dennedy.org>
Date: Wed, 12 Feb 2014 07:55:33 +0000 (-0800)
Subject: Fix closing the render thread.
X-Git-Url: https://git.sesse.net/?p=mlt;a=commitdiff_plain;h=8c792fd0a6df7305eb51765cf5548511a2b9bb22

Fix closing the render thread.

This makes Windows happy when used in conjunction with qmelt.
---

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;