projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Text Renderer - Fix the actor hierarchy." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-atlas
/
image-load-thread.cpp
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 );