Don't completely trust servo's tracking of the GL context in glutin

servo · Sep 20, 2019 · 5f503f0 · 5f503f0
1 parent a7ed8f7
commit 5f503f0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/ports/glutin/context.rs b/ports/glutin/context.rs
@@ -35,6 +35,13 @@ impl GlContext {
         *self = match std::mem::replace(self, GlContext::None) {
             GlContext::Current(c) => {
                 warn!("Making an already current context current");
+                // Servo thinks that that this window is current,
+                // but it might be wrong, since other code may have
+                // changed the current GL context. Just to be on
+                // the safe side, we make it current anyway.
+                let c = unsafe {
+                    c.make_current().expect("Couldn't make window current")
+                };
                 GlContext::Current(c)
             },
             GlContext::NotCurrent(c) => {