0021517: Bad filter dumped when hdf study from previous version of Salome is loaded

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

diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
index 42d51513b3215582ea560a0925653f0b97307d1b..329a587e88ba3fce902b9af90abda15bf492ac68 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
@@ -453,9 +453,6 @@ void SMESHGUI_FindElemByPointOp::onSelectionDone()
   if ( !myMeshIO.IsNull() && myMeshIO->hasEntry() )
     oldMeshEntry = myMeshIO->getEntry();
 
-  myDlg->myMeshName->setText("");
-  myMeshIO.Nullify();
-
   try {
     SALOME_ListIO aList;
     selectionMgr()->selectedObjects(aList, SVTK_Viewer::Type());
@@ -464,12 +461,16 @@ void SMESHGUI_FindElemByPointOp::onSelectionDone()
       Handle(SALOME_InteractiveObject) anIO = aList.First();
       _PTR(SObject) pObj = studyDS()->FindObjectID(anIO->getEntry());
       CORBA::Object_var anObj = SMESH::IObjectToObject( anIO );
-      myMeshOrPart = SMESH::SMESH_IDSource::_narrow(anObj);
-      if ( pObj && !myMeshOrPart->_is_nil() )
+      newMeshEntry = anIO->getEntry();
+      SMESH::SMESH_IDSource_var aMeshOrPart = SMESH::SMESH_IDSource::_narrow(anObj);
+      if ( pObj && !aMeshOrPart->_is_nil() && oldMeshEntry != newMeshEntry )
       {
+        myMeshOrPart = aMeshOrPart;
+        myMeshIO.Nullify();
         myMeshIO = anIO;
-        myDlg->myMeshName->setText( pObj->GetName().c_str() );
-        newMeshEntry = anIO->getEntry();
+        std::string name = pObj->GetName();
+        myDlg->myMeshName->setText("");
+        myDlg->myMeshName->setText( QString( name.c_str() ).trimmed() );
         SMESH::array_of_ElementType_var  types = myMeshOrPart->GetTypes();
         myDlg->setTypes( types );
       }