From 13d0dc562ddb2f6d39431b5690d0dff10ece4d5f Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 22 Nov 2018 15:58:01 +0300 Subject: [PATCH] 0023636: EDF 18217 - Problem wen suppressing CAD - Avoid crash on activating SMESH module after source geometry removal --- src/SMESH_I/SMESH_Gen_i_1.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 69a8f73b0..02d1ad001 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -237,7 +237,8 @@ GEOM::GEOM_Object_ptr SMESH_Gen_i::ShapeToGeomObject (const TopoDS_Shape& theSha if ( aClient && aClient->Find( theShape, IOR )) { CORBA::Object_var obj = GetORB()->string_to_object( IOR.ToCString() ); - aShapeObj = GEOM::GEOM_Object::_narrow ( obj ); + if ( !obj->_non_existent() ) + aShapeObj = GEOM::GEOM_Object::_narrow ( obj ); } } return aShapeObj._retn(); @@ -251,7 +252,7 @@ GEOM::GEOM_Object_ptr SMESH_Gen_i::ShapeToGeomObject (const TopoDS_Shape& theSha TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject) { TopoDS_Shape S; - if ( !theGeomObject->_is_nil() ) { + if ( !theGeomObject->_is_nil() && !theGeomObject->_non_existent() ) { GEOM_Client* aClient = GetShapeReader(); GEOM::GEOM_Gen_ptr aGeomEngine = GetGeomEngine(); if ( aClient && !aGeomEngine->_is_nil () ) -- 2.30.2