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 "Add GetSurfaceType() in TestRenderSurface" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
property-string-parser.cpp
diff --git
a/dali-toolkit/internal/text/property-string-parser.cpp
b/dali-toolkit/internal/text/property-string-parser.cpp
index
c120e00
..
42b1050
100644
(file)
--- a/
dali-toolkit/internal/text/property-string-parser.cpp
+++ b/
dali-toolkit/internal/text/property-string-parser.cpp
@@
-72,8
+72,10
@@
void ParsePropertyString( const std::string& property, Property::Map& map )
if( parser.Parse( property ) )
{
const TreeNode* const node = parser.GetRoot();
-
- CreatePropertyMap( node, map );
+ if( node )
+ {
+ CreatePropertyMap( node, map );
+ }
}
}