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 80f3c5b..e022fd4 100644 (file)
--- 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 )