From: mpv <mpv@opencascade.com>
Date: Tue, 7 Apr 2015 05:49:41 +0000 (+0300)
Subject: Fix for the problem on abort of sketch entity in sub-document: "deleted" event was... 
X-Git-Tag: V_1.1.0~54^2~8^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1018dadb09537f9ebf2a73d858401090e72c88d4;p=modules%2Fshaper.git

Fix for the problem on abort of sketch entity in sub-document: "deleted" event was not transmitted
---

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 71019bc6d..18fbc6658 100644
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -404,13 +404,13 @@ void Model_Document::abortOperation()
       myDoc->Undo();
     myDoc->ClearRedos();
   }
-  // references may be changed because they are set in attributes on the fly
-  synchronizeFeatures(true, true, isRoot());
-  // abort for all subs
+  // abort for all subs, flushes will be later, in the end of root abort
   const std::set<std::string> aSubs = subDocuments(true);
   std::set<std::string>::iterator aSubIter = aSubs.begin();
   for (; aSubIter != aSubs.end(); aSubIter++)
     subDoc(*aSubIter)->abortOperation();
+  // references may be changed because they are set in attributes on the fly
+  synchronizeFeatures(true, true, isRoot());
 }
 
 bool Model_Document::isOperation() const