Issue #18609 (Tuleap): Delete extra nodes from folder

diff --git a/src/PartSet/PartSet_TreeNodes.cpp b/src/PartSet/PartSet_TreeNodes.cpp
index e886365e2b28a63e4b789b5108d2b33b4cba15e3..dcd74cf6c0090934100500dc2607fb03d2b3814c 100644 (file)
--- a/src/PartSet/PartSet_TreeNodes.cpp
+++ b/src/PartSet/PartSet_TreeNodes.cpp
@@ -1083,7 +1083,7 @@ void PartSet_ObjectFolderNode::update()
     int aNbOfFeatures = aDoc->size(ModelAPI_Feature::group(), true);
     while (aId < myChildren.size()) {
       ModuleBase_ITreeNode* aNode = myChildren.at(aId);
-      if ((aFirst + aId) < aNbOfFeatures) {
+      if ((aId < aNbItems) && ((aFirst + aId) < aNbOfFeatures)) {
         if (aNode->object() != aDoc->object(ModelAPI_Feature::group(), aFirst + aId)) {
           myChildren.removeAll(aNode);
           delete aNode;

diff --git a/src/XGUI/XGUI_ObjectsBrowser.cpp b/src/XGUI/XGUI_ObjectsBrowser.cpp
index 75543ff5c9d92d572f1c6357e80a01c3429c264e..754034d3a3cc8b42178ae05569a920e59a5b9880 100644 (file)
--- a/src/XGUI/XGUI_ObjectsBrowser.cpp
+++ b/src/XGUI/XGUI_ObjectsBrowser.cpp
@@ -131,7 +131,7 @@ void XGUI_DataTree::commitData(QWidget* theEditor)
       if (XGUI_Tools::canRename(aObj, aName)) {
         SessionPtr aMgr = ModelAPI_Session::get();
         aMgr->startOperation("Rename");
-        aObj->data()->setName(qPrintable(aName));
+        aObj->data()->setName(aName.toStdString());
         aMgr->finishOperation();
       }
     }