diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-30 09:46:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-30 09:46:23 +0100 |
commit | 6a764d2164a64d490d63775111321d4d6bda7377 (patch) | |
tree | e0fb8b94f95b336f5ec24b00dfd905de9963f81e | |
parent | 3bc2e44bd387aa2185083fcf94eeee67f37380f3 (diff) | |
parent | 3314694004b825263c9b9f2d69bd85da806ccbbc (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12.0v5.12.0-beta4
Change-Id: I5499524c9f4553342d192d554d4455fd7933eaa9
-rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index 5d12729f2..8b98c658c 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -106,6 +106,7 @@ #include <QSurface> #include <QElapsedTimer> #include <QLibraryInfo> +#include <QMutexLocker> #include <QPluginLoader> #include <QDir> #include <QUrl> @@ -442,8 +443,10 @@ void Renderer::shutdown() // We delete any renderqueue that we may not have had time to render // before the surface was destroyed + QMutexLocker lockRenderQueue(m_renderQueue->mutex()); qDeleteAll(m_renderQueue->nextFrameQueue()); m_renderQueue->reset(); + lockRenderQueue.unlock(); m_commandThread->shutdown(); |