3 files changed, 18 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
index c62875d0ef..2d2d409a0f 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
@@ -512,6 +512,13 @@ QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
     if (pbuffer == EGL_NO_SURFACE)
         return;
 
+    EGLDisplay prevDisplay = eglGetCurrentDisplay();
+    if (prevDisplay == EGL_NO_DISPLAY) // when no context is current
+        prevDisplay = m_eglDisplay;
+    EGLContext prevContext = eglGetCurrentContext();
+    EGLSurface prevSurfaceDraw = eglGetCurrentSurface(EGL_DRAW);
+    EGLSurface prevSurfaceRead = eglGetCurrentSurface(EGL_READ);
+
     if (QWindowsEGLStaticContext::libEGL.eglMakeCurrent(m_eglDisplay, pbuffer, pbuffer, m_eglContext)) {
         const GLubyte *s = QWindowsEGLStaticContext::libGLESv2.glGetString(GL_VERSION);
         if (s) {
@@ -524,7 +531,7 @@ QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
         }
         m_format.setProfile(QSurfaceFormat::NoProfile);
         m_format.setOptions(QSurfaceFormat::FormatOptions());
-        QWindowsEGLStaticContext::libEGL.eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        QWindowsEGLStaticContext::libEGL.eglMakeCurrent(prevDisplay, prevSurfaceDraw, prevSurfaceRead, prevContext);
     }
     QWindowsEGLStaticContext::libEGL.eglDestroySurface(m_eglDisplay, pbuffer);
 }
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index e09018ef69..1ed27f545d 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -1207,6 +1207,9 @@ QWindowsGLContext::~QWindowsGLContext()
 
 bool QWindowsGLContext::updateObtainedParams(HDC hdc, int *obtainedSwapInterval)
 {
+    HGLRC prevContext = wglGetCurrentContext();
+    HDC prevSurface = wglGetCurrentDC();
+
     if (!QOpenGLStaticContext::opengl32.wglMakeCurrent(hdc, m_renderingContext)) {
         qWarning("Failed to make context current.");
         return false;
@@ -1217,7 +1220,7 @@ bool QWindowsGLContext::updateObtainedParams(HDC hdc, int *obtainedSwapInterval)
     if (m_staticContext->wglGetSwapInternalExt && obtainedSwapInterval)
         *obtainedSwapInterval = m_staticContext->wglGetSwapInternalExt();
 
-    QOpenGLStaticContext::opengl32.wglMakeCurrent(0, 0);
+    QOpenGLStaticContext::opengl32.wglMakeCurrent(prevSurface, prevContext);
     return true;
 }
 
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
index d6fe5f3477..3b13df863e 100644
--- a/src/plugins/platforms/xcb/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/qglxintegration.cpp
@@ -323,11 +323,11 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share)
 
     // Query the OpenGL version and profile
     if (m_context && window) {
+        GLXContext prevContext = glXGetCurrentContext();
+        GLXDrawable prevDrawable = glXGetCurrentDrawable();
         glXMakeCurrent(DISPLAY_FROM_XCB(screen), window, m_context);
         updateFormatFromContext(m_format);
-
-        // Make our context non-current
-        glXMakeCurrent(DISPLAY_FROM_XCB(screen), 0, 0);
+        glXMakeCurrent(DISPLAY_FROM_XCB(screen), prevDrawable, prevContext);
     }
 
     // Destroy our temporary window
@@ -419,6 +419,8 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share, const
     }
 
     // Update OpenGL version and buffer sizes in our format.
+    GLXContext prevContext = glXGetCurrentContext();
+    GLXDrawable prevDrawable = glXGetCurrentDrawable();
     if (!glXMakeCurrent(dpy, window, context)) {
         qWarning("QGLXContext: Failed to make provided context current");
         return;
@@ -431,7 +433,7 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share, const
         qglx_surfaceFormatFromVisualInfo(&m_format, dpy, vinfo);
     else
         qglx_surfaceFormatFromGLXFBConfig(&m_format, dpy, config);
-    glXMakeCurrent(dpy, 0, 0);
+    glXMakeCurrent(dpy, prevDrawable, prevContext);
     XDestroyWindow(dpy, window);
 
     if (vinfo)