From: David Steele Date: Fri, 27 Jan 2017 18:01:50 +0000 (-0800) Subject: Merge "Enable json tree dump to work with empty arrays" into devel/master X-Git-Tag: dali_1.2.25~7 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=d8675026530fc481627a4d3d48eaa84804de6386;hp=c377bb2e616dcf93403745332bfc57c90929b837 Merge "Enable json tree dump to work with empty arrays" into devel/master --- diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp index 4357cb8..9567306 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.cpp +++ b/dali-toolkit/internal/builder/tree-node-manipulator.cpp @@ -398,7 +398,7 @@ void TreeNodeManipulator::DoWrite(const TreeNode *value, std::ostream& output, i { bool groupMyChildren = false; - if( TreeNode::ARRAY == value->GetType() && + if( TreeNode::ARRAY == value->GetType() && value->mFirstChild && ( TreeNode::INTEGER == value->mFirstChild->GetType() || TreeNode::FLOAT == value->mFirstChild->GetType() ) ) {