diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2018-10-02 15:40:43 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2018-10-03 07:55:50 +0000 |
commit | c19036f8484e0ce08e4f38b7e0bd0d64772ded67 (patch) | |
tree | 7bcfc35b36f3b7e5f3361ace387f6674bf4139e4 | |
parent | 9b51fea01cc6b44c6ba49eda6a75cd92d9388689 (diff) |
QChangeArbiter: fix leak
When all observers for a node have been removed, we should also remove
its entry in m_nodeObservations hash.
Change-Id: I56762bb345e6a3eba74d5174b225dc86acd17e8f
Task-number: QTBUG-70892
Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/core/qchangearbiter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index d6c7e05df..2e32d6722 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -217,12 +217,15 @@ void QChangeArbiter::registerSceneObserver(QSceneObserverInterface *observer) void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNodeId nodeId) { QMutexLocker locker(&m_mutex); - if (m_nodeObservations.contains(nodeId)) { - QObserverList &observers = m_nodeObservations[nodeId]; + const auto it = m_nodeObservations.find(nodeId); + if (it != m_nodeObservations.end()) { + QObserverList &observers = it.value(); for (int i = observers.count() - 1; i >= 0; i--) { if (observers[i].second == observer) observers.removeAt(i); } + if (observers.isEmpty()) + m_nodeObservations.erase(it); } } |