Remove side effects of QGLXContext::queryDummyContext()

Task-number: QTBUG-34782 Change-Id: I411c89238b3002a118b1750af0157ccff5c78712 Reviewed-by: Gunnar Sletta <[email protected]>
petrmanek · Nov 14, 2013 · 9f75292 · 9f75292
1 parent 038b0da
commit 9f75292
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
@@ -431,6 +431,11 @@ void QGLXContext::queryDummyContext()
     if (skip)
         return;
 
+    QOpenGLContext *oldContext = QOpenGLContext::currentContext();
+    QSurface *oldSurface = 0;
+    if (oldContext)
+        oldSurface = oldContext->surface();
+
     QOffscreenSurface surface;
     surface.create();
     QOpenGLContext context;
@@ -446,6 +451,9 @@ void QGLXContext::queryDummyContext()
             break;
         }
     }
+
+    if (oldContext && oldSurface)
+        oldContext->makeCurrent(oldSurface);
 }
 
 bool QGLXContext::supportsThreading()