From: Dan Dennedy Date: Sat, 26 Nov 2011 03:56:02 +0000 (-0800) Subject: fix decklink compile on mingw X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e94d3ea1c6398e24673a1b919872ed6a8d50bdad;p=mlt fix decklink compile on mingw --- diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp index ca837132..39c251f2 100644 --- a/src/modules/decklink/consumer_decklink.cpp +++ b/src/modules/decklink/consumer_decklink.cpp @@ -273,6 +273,7 @@ public: bool stop() { mlt_properties properties = MLT_CONSUMER_PROPERTIES( getConsumer() ); + bool wasRunning = !!mlt_properties_get_int( properties, "running" ); // set running state is 0 mlt_properties_set_int( properties, "running", 0 ); @@ -291,9 +292,8 @@ public: m_decklinkFrame->Release(); m_decklinkFrame = NULL; - if ( m_prerollThread ) + if ( wasRunning ) pthread_join( m_prerollThread, NULL ); - m_prerollThread = 0; return true; }