Commit ae3a653b authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

Actually... the previous commit introduced a new deadlock... Now it's corrected.

parent d2af502b
......@@ -207,7 +207,7 @@ void ClipWorkflow::startRender( bool startInPausedMode )
if ( isReady() == false )
{
QMutexLocker lock( m_initWaitCond->getMutex() );
m_initWaitCond->wait();
m_initWaitCond->waitLocked();
}
if ( startInPausedMode == false )
......@@ -346,7 +346,10 @@ void ClipWorkflow::waitForCompleteRender( bool dontCheckRenderStarted /*=
void ClipWorkflow::waitForCompleteInit()
{
if ( isReady() == false )
m_initWaitCond->wait();
{
QMutexLocker lock( m_initWaitCond->getMutex() );
m_initWaitCond->waitLocked();
}
}
QMutex* ClipWorkflow::getSleepMutex()
......
......@@ -238,10 +238,7 @@ void MainWorkflow::stop()
for (unsigned int i = 0; i < m_trackCount; ++i)
{
if ( m_tracks[i].activated() == true )
{
m_tracks[i]->stop();
qDebug() << "Stopping track";
}
}
m_currentFrame = 0;
emit frameChanged( 0 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment