X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_GroupDlg.cxx;h=457cfecd347e9fa7c41c12f3694a9525aa6fb1d3;hb=b85751e356c091d2dffe8366a94fbb42bfcad34e;hp=aa3a15cbda1887e3e11e2447ed10742f8f422f19;hpb=e3fe383c97ecf3bedd8ac520632537d03a353ce5;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index aa3a15cbd..457cfecd3 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -797,7 +797,11 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
 	SALOMEDS::SObject_var aGroupMainShapeSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(aGroupMainShape) );
 	// The mesh SObject
 	SALOMEDS::SObject_var aMeshSO = aStudy->FindObjectIOR( aStudy->ConvertObjectToIOR(myMesh) );
-	
+        if ( aMeshSO->_is_nil() ) {
+          myGeomGroup = GEOM::GEOM_Object::_nil();
+          busy = false;
+          return;
+        }
 	SALOMEDS::SObject_var anObj, aRef;
 	bool isRefOrSubShape = false;
 	if ( aMeshSO->FindSubObject( 1, anObj ) &&  anObj->ReferencedObject( aRef )) {
@@ -1318,14 +1322,9 @@ void SMESHGUI_GroupDlg::onClose()
 {
   QAD_StudyFrame* aStudyFrame = mySMESHGUI->GetActiveStudy()->getActiveStudyFrame();
   if (aStudyFrame->getTypeView() == VIEW_VTK) {
+    SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
     SMESH::SetPointRepresentation(false);
     SMESH::SetPickable();
-
-    // remove filters from viewer
-    if(VTKViewer_InteractorStyleSALOME* aStyle = SMESH::GetInteractorStyle()){
-      SMESH::RemoveFilter(SMESHGUI_EdgeFilter,aStyle);
-      SMESH::RemoveFilter(SMESHGUI_FaceFilter,aStyle);
-    }
   }
   
   mySelection->ClearIObjects();