From c19036f8484e0ce08e4f38b7e0bd0d64772ded67 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Tue, 2 Oct 2018 15:40:43 +0200 Subject: QChangeArbiter: fix leak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Sean Harmer --- src/core/qchangearbiter.cpp | 7 +++++-- 1 file 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); } } -- cgit v1.2.3