From: dmv <dmv@opencascade.com>
Date: Tue, 7 Oct 2008 08:43:26 +0000 (+0000)
Subject: Merge Nodes dialog box with opened Merge Elements crashes Salome. Regress to series3x
X-Git-Tag: V5_1_0a3~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=266ebccd54d099fea48a0f247c9ba78edad33e47;p=modules%2Fsmesh.git

Merge Nodes dialog box with opened Merge Elements crashes Salome. Regress to series3x
---

diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
index 58079ec23..c0a08f1b5 100644
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
@@ -1067,6 +1067,9 @@ void SMESHGUI_EditMeshDlg::DeactivateActiveDialog()
     mySMESHGUI->ResetState();
     mySMESHGUI->SetActiveDialogBox(0);
   }
+
+  mySelectionMgr->clearSelected();
+  disconnect(mySelectionMgr, 0, this, 0);
 }
 
 //=================================================================================
@@ -1083,6 +1086,7 @@ void SMESHGUI_EditMeshDlg::ActivateThisDialog()
   GroupEdit->setEnabled(true);
   GroupButtons->setEnabled(true);
 
+  connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
   SelectionIntoArgument();
 }