(Image Atlas) Fix helgrind simultaneous access issue

Change-Id: I948c61ab962bd1469cafae82c7ee5c8709c722f0

diff --git a/dali-toolkit/internal/image-atlas/image-load-thread.cpp b/dali-toolkit/internal/image-atlas/image-load-thread.cpp
index d106690..c7da85b 100644 (file)
--- a/dali-toolkit/internal/image-atlas/image-load-thread.cpp
+++ b/dali-toolkit/internal/image-atlas/image-load-thread.cpp
@@ -87,14 +87,14 @@ CompleteQueue::~CompleteQueue()
 
 LoadingTask* CompleteQueue::NextTask()
 {
 
 LoadingTask* CompleteQueue::NextTask()
 {

-  while( mTasks.Empty() )
+  // Lock while popping task out from the queue
+  Mutex::ScopedLock lock( mMutex );
+
+  if( mTasks.Empty() )

   {
     return NULL;
   }
 
   {
     return NULL;
   }
 

-  // Lock while popping task out from the queue
-  Mutex::ScopedLock lock( mMutex );
-

   Vector< LoadingTask* >::Iterator next = mTasks.Begin();
   LoadingTask* nextTask = *next;
   mTasks.Erase( next );
   Vector< LoadingTask* >::Iterator next = mTasks.Begin();
   LoadingTask* nextTask = *next;
   mTasks.Erase( next );