]> git.sesse.net Git - mlt/commitdiff
Fix closing the render thread.
authorDan Dennedy <dan@dennedy.org>
Wed, 12 Feb 2014 07:55:33 +0000 (23:55 -0800)
committerDan Dennedy <dan@dennedy.org>
Wed, 12 Feb 2014 07:55:33 +0000 (23:55 -0800)
This makes Windows happy when used in conjunction with qmelt.

src/modules/qt/consumer_qglsl.cpp

index a1fb93656cdd504c6e34b5dc2a347d6ebdd1ad9b..ee841e6bc0f531e379af0b7a7994dbb86ed7cfb4 100644 (file)
@@ -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;