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

TaskTree: Ensure the same storage isn't added twice

Browse Source 
Change-Id: I780d61091fea39a4542b4f743593b5062a784ba5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-12-05 10:25:59 +01:00
parent 8aa7ec1072
commit dfdeb4d630
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/tasktree.cpp
View File

@@ -268,11 +268,22 @@ public:
GuardLocker locker(m_guard); GuardLocker locker(m_guard);
emit q->errorOccurred(); emit q->errorOccurred();
} }
QList<TreeStorageBase> addStorages(const QList<TreeStorageBase> &storages) {
QList<TreeStorageBase> addedStorages;
for (const TreeStorageBase &storage : storages) {
QTC_ASSERT(!m_storages.contains(storage), qWarning("Can't add the same storage into "
"one TaskTree twice, skipping..."); continue);
addedStorages << storage;
m_storages << storage;
}
return addedStorages;
}
TaskTree *q = nullptr; TaskTree *q = nullptr;
std::unique_ptr<TaskNode> m_root = nullptr; std::unique_ptr<TaskNode> m_root = nullptr;
Guard m_guard; Guard m_guard;
int m_progressValue = 0; int m_progressValue = 0;
QSet<TreeStorageBase> m_storages;
}; };
TaskContainer::TaskContainer(TaskTreePrivate *taskTreePrivate, TaskContainer *parentContainer, TaskContainer::TaskContainer(TaskTreePrivate *taskTreePrivate, TaskContainer *parentContainer,
@@ -282,7 +293,7 @@ TaskContainer::TaskContainer(TaskTreePrivate *taskTreePrivate, TaskContainer *pa
, m_executeMode(task.executeMode()) , m_executeMode(task.executeMode())
, m_workflowPolicy(task.workflowPolicy()) , m_workflowPolicy(task.workflowPolicy())
, m_groupHandler(task.groupHandler()) , m_groupHandler(task.groupHandler())
, m_storageList(task.storageList()) , m_storageList(taskTreePrivate->addStorages(task.storageList()))
{ {
const QList<TaskItem> &children = task.children(); const QList<TaskItem> &children = task.children();
for (const TaskItem &child : children) { for (const TaskItem &child : children) {