diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-10-17 07:16:01 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-10-17 07:16:01 +0200 |
| commit | d15a80e55dfe92363a8bd7d4ede513dd3db0a3fd (patch) | |
| tree | f2f27eaed293d09cb100e595484779d15ed75827 /src/render/renderers/opengl/renderer/renderer.cpp | |
| parent | 8a223a9160fd319c860f282bb93ec160c4a67f3e (diff) | |
| parent | f8ce62e2a1f028d5832d6b94baa8c4d7dbd4e588 (diff) | |
Merge remote-tracking branch '5.13' into 5.14
Change-Id: I39797b5e48cb627638443e20eed207af6ae86c9c
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderer.cpp')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index 9dfdf7d06..121a6aa8f 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -500,7 +500,8 @@ void Renderer::releaseGraphicsResources() QOpenGLContext *context = m_submissionContext->openGLContext(); Q_ASSERT(context); - if (context->makeCurrent(offscreenSurface)) { + + if (context->thread() == QThread::currentThread() && context->makeCurrent(offscreenSurface)) { // Clean up the graphics context and any resources const QVector<HGLTexture> activeTexturesHandles = m_nodesManager->glTextureManager()->activeHandles(); |