[vlmc-devel] ClipWorkflow: Simplification

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jan 24 20:10:03 2014 +0200| [6bfa58ca7bf296834671d3d701b546bb2b372133] | committer: Hugo Beauzée-Luyssen

ClipWorkflow: Simplification

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=6bfa58ca7bf296834671d3d701b546bb2b372133
---

 src/Workflow/ClipWorkflow.cpp |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index ac7bd95..4243de6 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -180,24 +180,18 @@ ClipWorkflow::getStateLock()
 bool
 ClipWorkflow::waitForCompleteInit()
 {
-    m_stateLock->lockForRead();
+    QReadLocker lock( m_stateLock );
+
     if ( m_state != ClipWorkflow::Rendering && m_state != ClipWorkflow::Error )
     {
         if ( m_state == ClipWorkflow::Error )
-        {
-            m_stateLock->unlock();
             return false;
-        }
 
         m_initWaitCond->wait( m_stateLock );
 
         if ( m_state == ClipWorkflow::Error )
-        {
-            m_stateLock->unlock();
             return false;
-        }
     }
-    m_stateLock->unlock();
     return true;
 }