Prevent exception at shape selection if no mesh was pre-selected

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_EditHypothesesDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx
index d6f2e149426c997286113ce9abb0f18b8bd751a8..2d162996a61f4f802591562e11171649b49b4b7e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.cxx
@@ -745,7 +745,8 @@ void SMESHGUI_EditHypothesesDlg::InitGeom()
   SALOMEDS::GenericAttribute_var    anAttr;
   SALOMEDS::AttributeName_var       aName;
   if ( !myGeomShape->_is_nil() && (!myMesh->_is_nil() || !mySubMesh->_is_nil()) ) {
-    SALOMEDS::SObject_var aSO = SMESH::GetActiveStudyDocument()->FindObjectIOR( myGeomShape->GetName() );
+    SALOMEDS::Study_var aStudy = SMESH::GetActiveStudyDocument();
+    SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(myGeomShape) );
     if ( !aSO->_is_nil() ) {
       if (aSO->FindAttribute(anAttr, "AttributeName") ) {
        aName = SALOMEDS::AttributeName::_narrow(anAttr);