X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fimage-atlas%2Fimage-load-thread.cpp;h=c7da85b62922400d92a6dfe0234fb26e862b87ec;hb=0dd2826b16facb7e8f21ffb86853bd1b0afb97b4;hp=d1066909a039cf3815eeea742e55be0914a7727e;hpb=4c6d34154c81cf86b4c3662b81e1223f3326ceb5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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
--- 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()
 {
-  while( mTasks.Empty() )
+  // Lock while popping task out from the queue
+  Mutex::ScopedLock lock( mMutex );
+
+  if( mTasks.Empty() )
   {
     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 );