diff options
author | Laszlo Agocs <[email protected]> | 2014-06-06 15:02:21 +0200 |
---|---|---|
committer | The Qt Project <[email protected]> | 2014-06-10 12:22:39 +0200 |
commit | 0a575482d5583076ba0ce812cab6c32732b1c280 (patch) | |
tree | a5c367fcd42e00c34f6ea33e3ca3a73615bd7efe /src/quick/scenegraph/qsgthreadedrenderloop.cpp | |
parent | ef526f9f332e00a2920b37dc0f715b1cb958597e (diff) |
Stop polish-and-sync timer when the window is destroyed
The threaded render loop continues to run the polish-and-sync timer for
ever in case the QQuickWindow is destroyed while the timer is active.
Instead of pumping the timer events on the render thread for ever, the
timer has to be killed somewhere.
Change-Id: I8e458624e26ebfacb6cc69a4f2fbb3da57ae5e0e
Reviewed-by: Gunnar Sletta <[email protected]>
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 0aa30280e5..ae8d135d83 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -1233,6 +1233,8 @@ bool QSGThreadedRenderLoop::event(QEvent *e) } if (w) polishAndSync(w); + else + killTimer(te->timerId()); } return true; } |