From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Tue, 30 Jun 2015 13:29:44 +0000 (+0100)
Subject: Change state before releasing mutex
X-Git-Tag: dali_1.0.48~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1501f2c9ca85d579c19ec2c75f0aae0fd905c93c;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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 60fdaaf02..290a82625 100644
--- 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 847038ef3..37f9d33d1 100644
--- 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