Merge remote-tracking branch 'origin/master' into gni/documentation

diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 89ee913212b018a424e1f7162b02ceb476009db7..093ab1075c61658676b99f1ef35d31a5641b413e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@ -250,12 +250,16 @@ void SMESHGUI_DeleteGroupDlg::onOk()
 //=================================================================================
 void SMESHGUI_DeleteGroupDlg::reject()
 {
+  if (SMESH::GetCurrentVtkView()) {
+    SMESH::RemoveFilters(); // PAL6938 -- clean all mesh entity filters
+  }
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   disconnect(mySelectionMgr, 0, this, 0);
-  disconnect(mySMESHGUI, 0, this, 0);
-  mySMESHGUI->ResetState();
+  //disconnect(mySMESHGUI, 0, this, 0);
+  //mySMESHGUI->ResetState();
   mySelectionMgr->clearFilters();
+  mySMESHGUI->ResetState();
   QDialog::reject();
 }