X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Object.cpp;h=dc76a0792dd2d925653ae077e039dc740bce4ec9;hb=4af82842098757e6e7f4f28e2eb744d184bb2b3e;hp=24a2b2d55c32740f5976a67d7bb7fc97c0f94b6b;hpb=83bbce5aee090aed21034874cd38c0c838f1733f;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Object.cpp b/src/ModelAPI/ModelAPI_Object.cpp
index 24a2b2d55..dc76a0792 100644
--- a/src/ModelAPI/ModelAPI_Object.cpp
+++ b/src/ModelAPI/ModelAPI_Object.cpp
@@ -12,7 +12,7 @@
 
 bool ModelAPI_Object::isInHistory()
 {
-  if (myData.get() && myData->isValid()) {
+  if (myData->isValid()) {
     return myData->isInHistory();
   }
   return true; // default value
@@ -22,7 +22,7 @@ void ModelAPI_Object::setInHistory(
   const std::shared_ptr<ModelAPI_Object> theObject, const bool theFlag)
 {
   if (isInHistory() != theFlag) {
-    if (myData.get() && myData->isValid()) {
+    if (myData->isValid()) {
       myData->setIsInHistory(theFlag);
     }
     myDoc->updateHistory(theObject);
@@ -68,8 +68,8 @@ void ModelAPI_Object::setDoc(std::shared_ptr<ModelAPI_Document> theDoc)
 
 void ModelAPI_Object::erase()
 {
-  if (myData) myData->erase();
-  setData(DataPtr());
+  if (myData->isValid() && myData != myData->invalidPtr()) myData->erase();
+  setData(myData->invalidPtr());
 }
 
 bool ModelAPI_Object::isDisplayed()