From 58d448919b915da97a7d378bac49fc8a977bd102 Mon Sep 17 00:00:00 2001
From: vsv <vitaly.smetannikov@opencascade.com>
Date: Mon, 9 Jun 2014 16:37:33 +0400
Subject: [PATCH] Check ShapePtr on validity

---
 src/XGUI/XGUI_Displayer.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index e588367b8..ae0ff21bb 100644
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -186,13 +186,14 @@ void XGUI_Displayer::redisplay(FeaturePtr theFeature, bool isUpdateViewer)
   if (!isVisible(aFeature))
     return;
 
-  Handle(AIS_InteractiveObject) aAISObj = getAISObject(aFeature);
   boost::shared_ptr<GeomAPI_Shape> aShapePtr = aFeature->data()->shape();
+  if (aShapePtr) {
+    Handle(AIS_InteractiveObject) aAISObj = getAISObject(aFeature);
+    Handle(AIS_Shape) aAISShape = Handle(AIS_Shape)::DownCast(aAISObj);
+    aAISShape->Set(aShapePtr->impl<TopoDS_Shape>());
 
-  Handle(AIS_Shape) aAISShape = Handle(AIS_Shape)::DownCast(aAISObj);
-  aAISShape->Set(aShapePtr->impl<TopoDS_Shape>());
-
-  AISContext()->Redisplay(aAISShape);
+    AISContext()->Redisplay(aAISShape);
+  }
 }
 
 void XGUI_Displayer::activateInLocalContext(FeaturePtr theFeature,
-- 
2.39.2