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
Fix a crash when the same image is set repeatedly
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
texture-manager.cpp
diff --git
a/dali-toolkit/internal/visuals/texture-manager.cpp
b/dali-toolkit/internal/visuals/texture-manager.cpp
index
0c839ad
..
7334b48
100644
(file)
--- a/
dali-toolkit/internal/visuals/texture-manager.cpp
+++ b/
dali-toolkit/internal/visuals/texture-manager.cpp
@@
-654,12
+654,15
@@
void TextureManager::ObserverDestroyed( TextureUploadObserver* observer )
for( unsigned int i = 0; i < count; ++i )
{
TextureInfo& textureInfo( mTextureInfoContainer[i] );
for( unsigned int i = 0; i < count; ++i )
{
TextureInfo& textureInfo( mTextureInfoContainer[i] );
- for( TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); j != textureInfo.observerList.End();
++j
)
+ for( TextureInfo::ObserverListType::Iterator j = textureInfo.observerList.Begin(); j != textureInfo.observerList.End(); )
{
if( *j == observer )
{
{
if( *j == observer )
{
- textureInfo.observerList.Erase( j );
- break;
+ j = textureInfo.observerList.Erase( j );
+ }
+ else
+ {
+ ++j;
}
}
}
}
}
}