From: akl <akl@opencascade.com>
Date: Tue, 8 Apr 2008 10:40:18 +0000 (+0000)
Subject: Fix of IPAL19448 (Qt4 porting: application hungs up at several Import MED file cycles).
X-Git-Tag: V5_0_0~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=119fd18e7622e3f5a46c2bf459d6a8b60af4d322;p=modules%2Fsmesh.git

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 9f4c705f3..66113ca18 100644
--- 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 3de13f6f6..7a6256462 100644
--- 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();
     }
   }