From: dmv <dmv@opencascade.com>
Date: Wed, 18 Nov 2009 08:50:03 +0000 (+0000)
Subject: Correct previous integration
X-Git-Tag: V5_1_3~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a657a15f5f39d67d30a41b000688033aa3d16b05;p=modules%2Fsmesh.git

Correct previous integration
---

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index e51f8c578..899581804 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -2158,7 +2158,7 @@ SMESH_Gen_i::ConcatenateCommon(const SMESH::mesh_array& theMeshesArray,
 
   // IPAL21468 Change icon of compound because it need not be computed.
   SALOMEDS::SObject_var aMeshSObj = ObjectToSObject( myCurrentStudy, aNewMesh );
-  if(aMeshSObj) {
+  if( !aMeshSObj->_is_nil() ) {
     SALOMEDS::GenericAttribute_var anAttr;
     SALOMEDS::StudyBuilder_var aBuilder = myCurrentStudy->NewBuilder();
     anAttr = aBuilder->FindOrCreateAttribute( aMeshSObj,"AttributePixMap" );