diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-07-07 10:17:14 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-07-12 19:14:02 +0000 |
commit | ca6ce92ee3e15cbc6208fd67c74c4778f48b12be (patch) | |
tree | 08eb40e00c80cfeb65bb3cc101b61174960b216d /src/input | |
parent | 2b3f68d588c15830ebbacf55823b2af049d76b47 (diff) |
Make Scene3D and Qt3D properly shutdown
Change-Id: I1bb43323cf371ed12148a11c925e94488189695b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/qinputaspect.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/input/qinputaspect.cpp b/src/input/qinputaspect.cpp index 901152bd4..6051ea754 100644 --- a/src/input/qinputaspect.cpp +++ b/src/input/qinputaspect.cpp @@ -137,8 +137,9 @@ void QInputAspect::onInitialize(const QVariantMap &data) void QInputAspect::onCleanup() { Q_D(QInputAspect); - d->m_inputHandler->eventSource()->removeEventFilter(d->m_cameraController); - d->m_inputHandler->setEventSource(Q_NULLPTR); + // At this point it is too late to call removeEventFilter as the eventSource (Window) + // may already be destroyed + d->m_inputHandler = Q_NULLPTR; } void QInputAspect::visitNode(QNode *node) |