From: skl <skl@opencascade.com>
Date: Thu, 19 Jun 2008 05:35:18 +0000 (+0000)
Subject: Update for bug IPAL19574.
X-Git-Tag: V4_1_4a1~62
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d606c0d54d4ad7e1132bae0744468ce0282a5c82;p=modules%2Fsmesh.git

Update for bug IPAL19574.
---

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 07f9587fb..4c254fa74 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -1159,15 +1159,22 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
 	  aString = tr("SMESH_GROUP_SELECTED").arg(aNbSel);
 	else if(myCurrentLineEdit == myGeomGroupLine)
 	  aString = tr("%1 Objects").arg(aNbSel);
-      } else {
+      }
+      else {
 	aString = aList.First()->getName();
       }
     }
 
     myCurrentLineEdit->setText(aString);
-    myOldName = myName->text();
-    myName->setText(aString);
     myCurrentLineEdit->home(false);
+    // 07.06.2008 skl for IPAL19574:
+    // change name of group only if it is empty
+    QString tmp = myName->text();
+    tmp.stripWhiteSpace();
+    if(tmp.isEmpty()) {
+      myOldName = myName->text();
+      myName->setText(aString);
+    }
 
     updateButtons();