Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / ModuleBase / ModuleBase_ITreeNode.h

diff --git a/src/ModuleBase/ModuleBase_ITreeNode.h b/src/ModuleBase/ModuleBase_ITreeNode.h
index 77d1d2a46fa6fb71b35ba5e52669f9eab5c59198..33b8d8a6450dcf922a08a571b33d391971a36f77 100644 (file)
--- a/src/ModuleBase/ModuleBase_ITreeNode.h
+++ b/src/ModuleBase/ModuleBase_ITreeNode.h
@@ -183,11 +183,20 @@ protected:
       ModuleBase_ITreeNode* aNode = 0;
       ObjectPtr aObject;
       int aIdx;
-      while (i < myChildren.size()) {
+      int aCount = 0;
+      int aSize = myChildren.size();
+      int aMaxCount = aSize * aSize;
+      int aShift = 0;
+      while (i < aSize) {
+        aCount++;
+        // To avoid unlimited cycling
+        if (aCount > aMaxCount)
+          break;
+
         aNode = myChildren.at(i);
         aObject = aNode->object();
         if (aObject.get()) {
-          aIdx = aObject->document()->index(aObject, true);
+          aIdx = aObject->document()->index(aObject, true) + aShift;
           if (aIdx != i) {
             myChildren.removeAll(aNode);
             myChildren.insert(aIdx, aNode);
@@ -195,6 +204,8 @@ protected:
             continue;
           }
         }
+        else
+          aShift++;
         i++;
       }
     }