feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectTree: Fix crash working with resources

Browse Source 
Fix the notification of subtree changes to keep the project in
the loop, so that it can adjust its list of known files.

Ignoring that will cause crashes, e.g. when the ResourceEditor
updates its subtree of the project.

Task-number: QTCREATORBUG-19613
Change-Id: Ib7bb9afe48eb248cdf675ba2093b266fd728d7b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-01-19 11:55:28 +01:00
parent cf94a15379
commit 034f0209b0
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/projectexplorer/project.cpp
View File

@@ -527,29 +527,33 @@ void Project::setRootProjectNode(ProjectNode *root)
root = nullptr;
}
ProjectTree::applyTreeManager(root);
if (root) {
ProjectTree::applyTreeManager(root);
root->setParentFolderNode(d->m_containerNode.get());
}
ProjectNode *oldNode = d->m_rootProjectNode;
d->m_rootProjectNode = root;
if (root) {
QVector<const Node *> nodeList;
root->forEachGenericNode([&nodeList](const Node *n) {
if (oldNode || root)
handleSubTreeChanged(d->m_containerNode.get());
delete oldNode;
}
void Project::handleSubTreeChanged(FolderNode *node)
{
QVector<const Node *> nodeList;
if (d->m_rootProjectNode) {
d->m_rootProjectNode->forEachGenericNode([&nodeList](const Node *n) {
nodeList.append(n);
});
Utils::sort(nodeList, &nodeLessThan);
d->m_sortedNodeList = nodeList;
root->setParentFolderNode(d->m_containerNode.get());
// Only announce non-null root, null is only used when project is destroyed.
// In that case SessionManager::projectRemoved() triggers the update.
ProjectTree::emitSubtreeChanged(root);
emit fileListChanged();
} else {
d->m_sortedNodeList.clear();
if (oldNode != nullptr)
emit fileListChanged();
}
d->m_sortedNodeList = nodeList;
delete oldNode;
ProjectTree::emitSubtreeChanged(node);
emit fileListChanged();
}
Target *Project::restoreTarget(const QVariantMap &data)