From 32c03ac03cf424e7055a7237c2c0901d70dca1e8 Mon Sep 17 00:00:00 2001
From: mpv <mikhail.ponikarov@opencascade.com>
Date: Fri, 16 May 2014 11:30:21 +0400
Subject: [PATCH] Correct update of tree on abort operation

---
 src/Model/Model_Document.cpp              |  1 +
 src/SketchPlugin/SketchPlugin_Feature.cpp | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 73e6adbc7..7618babe2 100644
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -196,6 +196,7 @@ void Model_Document::finishOperation()
 void Model_Document::abortOperation()
 {
   myDoc->AbortCommand();
+  synchronizeFeatures();
   // abort for all subs
   set<string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)
diff --git a/src/SketchPlugin/SketchPlugin_Feature.cpp b/src/SketchPlugin/SketchPlugin_Feature.cpp
index 00c849fc9..e75bc01e6 100644
--- a/src/SketchPlugin/SketchPlugin_Feature.cpp
+++ b/src/SketchPlugin/SketchPlugin_Feature.cpp
@@ -18,13 +18,15 @@ void SketchPlugin_Feature::setData(boost::shared_ptr<ModelAPI_Data> theData)
   for(int a = 0; a < aSketches && !mySketch; a++) {
     boost::shared_ptr<SketchPlugin_Sketch> aSketch = 
       boost::dynamic_pointer_cast<SketchPlugin_Sketch>(document()->feature("Construction", a));
-    std::list<boost::shared_ptr<ModelAPI_Feature> > aList = 
-      aSketch->data()->reflist(SKETCH_ATTR_FEATURES)->list();
-    std::list<boost::shared_ptr<ModelAPI_Feature> >::iterator aSub = aList.begin();
-    for(; aSub != aList.end(); aSub++) {
-      if ((*aSub)->data()->isEqual(theData)) {
-        mySketch = aSketch.get();
-        break;
+    if (aSketch) {
+      std::list<boost::shared_ptr<ModelAPI_Feature> > aList = 
+        aSketch->data()->reflist(SKETCH_ATTR_FEATURES)->list();
+      std::list<boost::shared_ptr<ModelAPI_Feature> >::iterator aSub = aList.begin();
+      for(; aSub != aList.end(); aSub++) {
+        if ((*aSub)->data()->isEqual(theData)) {
+          mySketch = aSketch.get();
+          break;
+        }
       }
     }
   }
-- 
2.39.2