Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix deadlock in NemoVideoTextureBackend destructor
  • Loading branch information
dzakurin authored and pvuorela committed Feb 20, 2020
1 parent 956bcad commit 3d03759
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/videotexturebackend/videotexturebackend.cpp
Expand Up @@ -577,6 +577,7 @@ void NemoVideoTextureBackend::cameraStateChanged(QCamera::State newState)
if (m_mirror != mirror) {
m_mirror = mirror;
m_geometryChanged = true;
locker.unlock();
q->update();
}
}
Expand Down Expand Up @@ -616,10 +617,9 @@ void NemoVideoTextureBackend::releaseSource()

void NemoVideoTextureBackend::releaseControl()
{
QMutexLocker locker(&m_mutex);
if (m_service && m_control) {
m_service->releaseControl(m_control.data());
m_control = 0;
m_service->releaseControl(m_control);
m_control.clear();
}
}

Expand Down

0 comments on commit 3d03759

Please sign in to comment.