projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[3.0] Delete ThreadLocalStorage on shutdown
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
common
/
core-impl.cpp
diff --git
a/dali/internal/common/core-impl.cpp
b/dali/internal/common/core-impl.cpp
index
fafe5b3
..
8f07f35
100644
(file)
--- a/
dali/internal/common/core-impl.cpp
+++ b/
dali/internal/common/core-impl.cpp
@@
-192,6
+192,7
@@
Core::~Core()
if( tls )
{
tls->Remove();
if( tls )
{
tls->Remove();
+ delete tls;
}
// Stop relayout requests being raised on stage destruction
}
// Stop relayout requests being raised on stage destruction
@@
-464,7
+465,7
@@
RelayoutController& Core::GetRelayoutController()
void Core::CreateThreadLocalStorage()
{
// a pointer to the ThreadLocalStorage object will be stored in TLS
void Core::CreateThreadLocalStorage()
{
// a pointer to the ThreadLocalStorage object will be stored in TLS
- //
and automatically deleted when the thread is killed
+ //
The ThreadLocalStorage object should be deleted by the Core destructor
new ThreadLocalStorage(this);
}
new ThreadLocalStorage(this);
}