Merge branch 'jb48607' into 'master'

Fix deadlock in NemoVideoTextureBackend destructor See merge request mer-core/nemo-qtmultimedia-plugins!11
sailfishos · Feb 20, 2020 · d63c62e · d63c62e
2 parents 956bcad + 3d03759
commit d63c62e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/videotexturebackend/videotexturebackend.cpp b/src/videotexturebackend/videotexturebackend.cpp
@@ -577,6 +577,7 @@ void NemoVideoTextureBackend::cameraStateChanged(QCamera::State newState)
     if (m_mirror != mirror) {
         m_mirror = mirror;
         m_geometryChanged = true;
+        locker.unlock();
         q->update();
     }
 }
@@ -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();
     }
 }