From: mpv <mpv@opencascade.com>
Date: Fri, 7 Sep 2018 06:02:19 +0000 (+0300)
Subject: Issue #2628 : crash on move history line outside of folder. Correct management of... 
X-Git-Tag: V9_2_0a1~48
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e37b7a0f36be9727f1727a0f9621a09690534407;p=modules%2Fshaper.git

Issue #2628 : crash on move history line outside of folder. Correct management of folders content on move to the end implementation.
---

diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp
index 1fdd49ac3..1b8dad602 100644
--- a/src/Model/Model_Objects.cpp
+++ b/src/Model/Model_Objects.cpp
@@ -378,6 +378,9 @@ void Model_Objects::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
   if (theAfterThis.get())
     anAfterLab = std::dynamic_pointer_cast<Model_Data>(theAfterThis->data())->label().Father();
 
+  // check whether some folder refers to the moved feature by start or end: if yes, remove from it
+  removeFromFolder(std::list<FeaturePtr>(1, theMoved));
+
   Handle(TDataStd_HLabelArray1) aNewArray =
     new TDataStd_HLabelArray1(aRefs->Lower(), aRefs->Upper());
   int aPassedMovedFrom = 0; // the prev feature location is found and passed