Commit 59019433 authored by Yoann Lopes's avatar Yoann Lopes Committed by Qt by Nokia

Fix possible crash in QSGContext::invalidate()

In some cases QSGContext::invalidate() was called without any current
GL context when the render thread was terminated.

Change-Id: Ia5295c89fe13f2473115c736e328e386d6d4d183
Reviewed-by: default avatarGunnar Sletta <gunnar.sletta@nokia.com>
parent 3a3515b5
......@@ -228,7 +228,7 @@ public slots:
private:
void handleAddedWindows();
void handleAddedWindow(QQuickCanvas *canvas);
void handleRemovedWindows();
void handleRemovedWindows(bool clearGLContext = true);
QSGContext *sg;
QOpenGLContext *gl;
......@@ -475,7 +475,7 @@ void QQuickRenderThreadSingleContextWindowManager::hide(QQuickCanvas *canvas)
/*!
Called on Render Thread
*/
void QQuickRenderThreadSingleContextWindowManager::handleRemovedWindows()
void QQuickRenderThreadSingleContextWindowManager::handleRemovedWindows(bool clearGLContext)
{
#ifdef THREAD_DEBUG
printf(" RenderThread: about to remove %d\n", m_removed_windows.size());
......@@ -496,7 +496,7 @@ void QQuickRenderThreadSingleContextWindowManager::handleRemovedWindows()
// If a window is removed because it has been hidden it will take with it
// the gl context (at least on Mac) if bound, so disconnect the gl context
// from anything
if (removedAnything)
if (removedAnything && clearGLContext)
gl->doneCurrent();
}
......@@ -755,7 +755,7 @@ void QQuickRenderThreadSingleContextWindowManager::run()
#endif
m_removed_windows << m_rendered_windows.keys();
handleRemovedWindows();
handleRemovedWindows(false);
sg->invalidate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment