+ prop->Delete();

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Utils.cxx

diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 89d5d2d934e16de7441633aa05e291615a1ba346..94ef5c93b6b896f44ebfdc9a3c60079116e361bf 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/src/SMESHGUI/SMESHGUI_Utils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -252,7 +252,7 @@ namespace SMESH
     int aNbSel = selected.Extent();
     if (aNbSel == 1) {
       Handle(SALOME_InteractiveObject) anIObject = selected.First();
-      theName = anIObject->getName();
+      theName = QString( anIObject->getName() ).trimmed();
     } else {
       theName = QObject::tr("SMESH_OBJECTS_SELECTED").arg(aNbSel);
     }
@@ -315,9 +315,12 @@ namespace SMESH
               SObjectToInterface<SMESH::SMESH_GroupOnFilter>( aSObj1 );
             const bool isGroupOnFilter = !gof->_is_nil();
 
-            SMESH::array_of_ElementType_var elemTypes = idSrc->GetTypes();
-            const bool isEmpty = ( elemTypes->length() == 0 );
-
+            bool isEmpty = false;
+            if ( !isGroupOnFilter ) // GetTypes() can be very long on isGroupOnFilter!
+            {
+              SMESH::array_of_ElementType_var elemTypes = idSrc->GetTypes();
+              isEmpty = ( elemTypes->length() == 0 );
+            }
             if ( isEmpty )
               aPixmap->SetPixMap("ICON_SMESH_TREE_MESH_WARN");
             else if ( objType != GROUP )