From 1ed659ce73f4ac73eaf7aab64abbb2a8e38fa20c Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Tue, 1 Dec 2015 18:36:07 +0000 Subject: [PATCH] Fix the segmentation fault error cause by ImageAtlas when application quiting Change-Id: Idcb694b29b39c055060c26190d47a5a9eddb17c5 --- dali-toolkit/internal/image-atlas/atlas-packer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/image-atlas/atlas-packer.cpp b/dali-toolkit/internal/image-atlas/atlas-packer.cpp index 7178741..b061ec5 100644 --- a/dali-toolkit/internal/image-atlas/atlas-packer.cpp +++ b/dali-toolkit/internal/image-atlas/atlas-packer.cpp @@ -176,12 +176,12 @@ void AtlasPacker::MergeToNonOccupied( Node* node ) node->occupied = false; Node* parent = node->parent; // both child are not occupied, merge the space to parent - if( parent !=NULL && parent->child[0]->occupied == false && parent->child[1]->occupied == false) + if( parent != NULL && parent->child[0]->occupied == false && parent->child[1]->occupied == false) { delete parent->child[0]; parent->child[0] = NULL; delete parent->child[1]; - parent->child[0] = NULL; + parent->child[1] = NULL; MergeToNonOccupied( parent ); } -- 2.7.4