Fix of IPAL19448 (Qt4 porting: application hungs up at several Import MED file cycles).

diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx
index 9f4c705f3aadbe423ed1258ec8420e4b540d51ad..66113ca185f8f21543b12474e0c4e89f5c151717 100644 (file)
--- a/src/SMESH_I/SMESH_Group_i.cxx
+++ b/src/SMESH_I/SMESH_Group_i.cxx
@@ -80,8 +80,9 @@ SMESH_GroupOnGeom_i::SMESH_GroupOnGeom_i( PortableServer::POA_ptr thePOA, SMESH_
 SMESH_GroupBase_i::~SMESH_GroupBase_i()
 {
   MESSAGE("~SMESH_GroupBase_i; this = "<<this );
-  if ( myMeshServant )
-    myMeshServant->removeGroup(myLocalID);
+  // akl: removeGroup() is called from SMESH_Mesh_i() destructor
+  // if ( myMeshServant )
+  //   myMeshServant->removeGroup(myLocalID);
 }
 
 //=======================================================================

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 3de13f6f6a9433635af3d7b8f429a2d3a356f62f..7a6256462247a08395ac5b36d7b2173414d0da96 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -121,6 +121,7 @@ SMESH_Mesh_i::~SMESH_Mesh_i()
       // this method is colled from destructor of group (PAL6331)
       //_impl->RemoveGroup( aGroup->GetLocalID() );
 
+      removeGroup( aGroup->GetLocalID() );
       aGroup->Destroy();
     }
   }