From 89fc92b9a778ad833bfa319c6db370d12f49abef Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 8 Jun 2021 17:04:21 +0200 Subject: [PATCH] Fix inexplicably changed condition in GL backingstore composition In a13e8d6660913bec172d1374f78083498c539df0 which provided the move and decoupling of OpenGL code the !makeCurrent-succeeded && !context-is-valid condition got changed to !makeCurrent-succeeded && context-is-valid which makes no sense because what we test for is context lost situations, in which case makeCurrent fails and isValid() reports false. Restore the ! that went missing in the above mentioned patch. Change-Id: I94f84d2853bcbd2965f76ecd665d3614b1f0e746 Reviewed-by: Andy Nichols (cherry picked from commit c6c6e01e893b211f51511929b4258f789cdfd428) Reviewed-by: Qt Cherry-pick Bot --- src/opengl/qplatformbackingstoreopenglsupport.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/opengl/qplatformbackingstoreopenglsupport.cpp b/src/opengl/qplatformbackingstoreopenglsupport.cpp index 46e36c23d46..30532c5b4ba 100644 --- a/src/opengl/qplatformbackingstoreopenglsupport.cpp +++ b/src/opengl/qplatformbackingstoreopenglsupport.cpp @@ -174,7 +174,8 @@ void QPlatformBackingStoreOpenGLSupport::composeAndFlush(QWindow *window, const bool current = context->makeCurrent(window); - if (!current && context->isValid()) { + if (!current && !context->isValid()) { + // release resources and attempt to reinitialize upon context loss delete blitter; blitter = nullptr; textureId = 0;