kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #21965 from tetektoza/fix/21861_crashes_selection_during_deletion

Browse Source 
Core: Fix crashes during item deletion in specific selection order
This commit is contained in:
Kacper Donat
2025-06-17 00:39:17 +02:00
committed by GitHub
parent fca41e4003 fdf002df2d
commit 34dfd00b1e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/Tree.cpp
View File

@@ -4016,6 +4016,9 @@ void TreeWidget::_slotDeleteObject(const Gui::ViewProviderDocumentObject& view,
TREE_LOG("delete object " << obj->getFullName()); TREE_LOG("delete object " << obj->getFullName());
// Block all selection signals during deletion to prevent cascading selection change events
// during item creation or deletion
bool lock = blockSelection(true);
bool needUpdate = false; bool needUpdate = false;
for (const auto& data : itEntry->second) { for (const auto& data : itEntry->second) {
@@ -4029,13 +4032,11 @@ void TreeWidget::_slotDeleteObject(const Gui::ViewProviderDocumentObject& view,
if (obj->getDocument() == doc) if (obj->getDocument() == doc)
docItem->_ParentMap.erase(obj); docItem->_ParentMap.erase(obj);
bool lock = blockSelection(true);
for (auto cit = items.begin(), citNext = cit; cit != items.end(); cit = citNext) { for (auto cit = items.begin(), citNext = cit; cit != items.end(); cit = citNext) {
++citNext; ++citNext;
(*cit)->myOwner = nullptr; (*cit)->myOwner = nullptr;
delete* cit; delete* cit;
} }
blockSelection(lock);
// Check for any child of the deleted object that is not in the tree, and put it // Check for any child of the deleted object that is not in the tree, and put it
// under document item. // under document item.
@@ -4062,6 +4063,9 @@ void TreeWidget::_slotDeleteObject(const Gui::ViewProviderDocumentObject& view,
} }
ObjectTable.erase(itEntry); ObjectTable.erase(itEntry);
// Restore signal state
blockSelection(lock);
if (needUpdate) if (needUpdate)
_updateStatus(); _updateStatus();
} }
@@ -5356,6 +5360,11 @@ enum Status {
void DocumentObjectItem::testStatus(bool resetStatus, QIcon& icon1, QIcon& icon2) void DocumentObjectItem::testStatus(bool resetStatus, QIcon& icon1, QIcon& icon2)
{ {
// guard against calling this during destruction when tree widget may be nullptr
if (!treeWidget()) {
return;
}
App::DocumentObject* pObject = object()->getObject(); App::DocumentObject* pObject = object()->getObject();
int visible = -1; int visible = -1;