X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Fflex-node.cpp;h=8a7dae68ff1da6630407c0da8927d2afdf65f8a8;hp=c3636dcdb74c4c77d7e8066ac5a2721becc1fe63;hb=40455b5d07b94320ec953a906f861bd9d6a367f4;hpb=4464c30c30e68c6eee56cda1a201b22eb164fd20

diff --git a/dali-toolkit/devel-api/layouting/flex-node.cpp b/dali-toolkit/devel-api/layouting/flex-node.cpp
index c3636dc..8a7dae6 100644
--- a/dali-toolkit/devel-api/layouting/flex-node.cpp
+++ b/dali-toolkit/devel-api/layouting/flex-node.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,9 +93,12 @@ Node::Node()
 Node::~Node()
 {
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() >> \n");
+  // Destruct child Flex::Node first
+  mImpl->mChildNodes.clear();
+
   if(mImpl->mYogaNode)
   {
-    YGNodeFreeRecursive(mImpl->mYogaNode);
+    YGNodeFree(mImpl->mYogaNode);
     mImpl->mYogaNode = nullptr;
   }
   DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() <<\n");