From: David Fumanal <d.fumanal@samsung.com>
Date: Wed, 1 Jul 2015 09:53:09 +0000 (+0100)
Subject: Fix in RenderAttachment destructor
X-Git-Tag: dali_1.0.48~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a75f5c32aa9a34d2ee6a6e467ee27e0143447db;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fix in RenderAttachment destructor

Change-Id: I2bb8be038314b07cd410a3ab28739b35cb843926
---

diff --git a/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
index 80f3c5be5..e022fd429 100644
--- a/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp
@@ -81,11 +81,16 @@ RendererAttachment::RendererAttachment()
 
 RendererAttachment::~RendererAttachment()
 {
-  mMaterial->RemoveConnectionObserver(*this);
-  mGeometry->RemoveConnectionObserver(*this);
-
-  mMaterial=NULL;
-  mGeometry=NULL;
+  if (mMaterial)
+  {
+    mMaterial->RemoveConnectionObserver(*this);
+    mMaterial=NULL;
+  }
+  if (mGeometry)
+  {
+    mGeometry->RemoveConnectionObserver(*this);
+    mGeometry=NULL;
+  }
 }
 
 void RendererAttachment::Initialize2( BufferIndex updateBufferIndex )