]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Fix for the issue #1538 (not reproduced after this)
authormpv <mpv@opencascade.com>
Wed, 1 Jun 2016 12:17:04 +0000 (15:17 +0300)
committermpv <mpv@opencascade.com>
Wed, 1 Jun 2016 12:17:04 +0000 (15:17 +0300)
src/Model/Model_AttributeRefAttrList.cpp
src/ModuleBase/ModuleBase_Tools.cpp

index 94b301921473300427d5ca36df0e908f74aa61b3..3cfd46274cc54ce37279d6dd3242c9185c9806be 100755 (executable)
@@ -142,10 +142,13 @@ std::list<std::pair<ObjectPtr, AttributePtr> > Model_AttributeRefAttrList::list(
     TDataStd_ListIteratorOfListOfExtendedString anIDIter(anIDList);
     for (; aLIter.More(); aLIter.Next(), anIDIter.Next()) {
       ObjectPtr anObj;
-      if (!aLIter.Value().IsNull())
+      if (!aLIter.Value().IsNull()) {
         anObj = aDoc->objects()->object(aLIter.Value());
-      aResult.push_back(std::pair<ObjectPtr, AttributePtr>(anObj, 
-        anObj->data()->attribute(TCollection_AsciiString(anIDIter.Value()).ToCString())));
+        aResult.push_back(std::pair<ObjectPtr, AttributePtr>(anObj, 
+          anObj->data()->attribute(TCollection_AsciiString(anIDIter.Value()).ToCString())));
+      } else {
+        aResult.push_back(std::pair<ObjectPtr, AttributePtr>(ObjectPtr(), AttributePtr()));
+      }
     }
   }
   return aResult;
index 28e41314fd1657eb88105f4fe965f77a38e48c88..043709e8f24a3443941b9d1c63515ae28d93c919 100755 (executable)
@@ -123,7 +123,7 @@ void setShadowEffect(QWidget* theWidget, const bool isSetEffect)
   else {
     QGraphicsEffect* anEffect = theWidget->graphicsEffect();
     if(anEffect)
-    anEffect->deleteLater();
+      anEffect->deleteLater();
     theWidget->setGraphicsEffect(NULL);
   }
 }