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 fcd6c7bd46b2560519cb26c0a7ad81a60820c990..33b8d8a6450dcf922a08a571b33d391971a36f77 100644 (file)
--- a/src/ModuleBase/ModuleBase_ITreeNode.h
+++ b/src/ModuleBase/ModuleBase_ITreeNode.h
@@ -178,23 +178,36 @@ protected:
   }
 
   void sortChildren() {
-    int i = 0;
-    ModuleBase_ITreeNode* aNode = 0;
-    ObjectPtr aObject;
-    int aIdx;
-    while (i < myChildren.size()) {
-      aNode = myChildren.at(i);
-      aObject = aNode->object();
-      if (aObject.get()) {
-        aIdx = aObject->document()->index(aObject, true);
-        if (aIdx != i) {
-          myChildren.removeAll(aNode);
-          myChildren.insert(aIdx, aNode);
-          i = 0;
-          continue;
+    if (myChildren.size() > 1) {
+      int i = 0;
+      ModuleBase_ITreeNode* aNode = 0;
+      ObjectPtr aObject;
+      int aIdx;
+      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) + aShift;
+          if (aIdx != i) {
+            myChildren.removeAll(aNode);
+            myChildren.insert(aIdx, aNode);
+            i = 0;
+            continue;
+          }
         }
+        else
+          aShift++;
+        i++;
       }
-      i++;
     }
   }