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

Fix freeze when clearing search results while doing a search in search

Browse Source 
By fixing a deadlock in aggregate destructor.

Task-number: QTCREATORBUG-7757
Change-Id: I6dffb06a92fb57b23a38b26b1528aed9f9f9d5da
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Eike Ziller
2012-09-07 15:20:09 +02:00
parent beb6bf2972
commit b17e944d4b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/aggregation/aggregate.cpp
View File

@@ -203,14 +203,18 @@ Aggregate::Aggregate(QObject *parent)
*/ */
Aggregate::~Aggregate() Aggregate::~Aggregate()
{ {
QList<QObject *> components;
{
QWriteLocker locker(&lock()); QWriteLocker locker(&lock());
foreach (QObject *component, m_components) { foreach (QObject *component, m_components) {
disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*))); disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*)));
aggregateMap().remove(component); aggregateMap().remove(component);
} }
qDeleteAll(m_components); components = m_components;
m_components.clear(); m_components.clear();
aggregateMap().remove(this); aggregateMap().remove(this);
}
qDeleteAll(components);
} }
void Aggregate::deleteSelf(QObject *obj) void Aggregate::deleteSelf(QObject *obj)