summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2020-04-24 08:24:24 +0200
committerAndy Shaw <andy.shaw@qt.io>2020-04-24 10:50:29 +0200
commit3a0d77e22af912129612f8c06855093d57246070 (patch)
tree36eb6bebe827f9214b8a852d00eefb8dbdd72432
parentac3d2f540c7868003be65fd11e0ca28b8149a604 (diff)
Unregister the event filter when the render aspect is unregistered
This prevents a crash when an event filter was used and the render aspect was being deleted but the event filters were being accessed still later on. Change-Id: I56586061d85f569f0cc9ffd5ec6b83a5455dd207 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/render/frontend/qrenderaspect.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index d9b53cb8d..de99840b2 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -842,6 +842,9 @@ void QRenderAspect::onUnregistered()
d->m_renderer->releaseGraphicsResources();
+ if (d->m_aspectManager)
+ d->services()->eventFilterService()->unregisterEventFilter(d->m_pickEventFilter.data());
+
delete d->m_nodeManagers;
d->m_nodeManagers = nullptr;