Change state before releasing mutex

Change-Id: I696606f63baa61eb20585e9f5fb86f6da0ea56d2

diff --git a/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp b/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
index 60fdaaf..290a826 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
@@ -76,7 +76,7 @@ int UtcDaliMutexMultiThread(void)
 {
   tet_infoline("Testing Dali::Mutex multithreaded");
 
-  gGlobalValueMutex = new Dali::Mutex;
+  gGlobalValueMutex = new Dali::Mutex();
 
   pthread_t thread1;
   // initialize values

diff --git a/dali/devel-api/common/mutex.cpp b/dali/devel-api/common/mutex.cpp
index 847038e..37f9d33 100644 (file)
--- a/dali/devel-api/common/mutex.cpp
+++ b/dali/devel-api/common/mutex.cpp
@@ -59,8 +59,8 @@ Mutex::ScopedLock::ScopedLock( Mutex& mutex )
 
 Mutex::ScopedLock::~ScopedLock()
 {
-  pthread_mutex_unlock( &mMutex.mImpl->mutex );
   mMutex.mImpl->locked = false;
+  pthread_mutex_unlock( &mMutex.mImpl->mutex );
 }
 
 } // namespace Dali