From 0a1a7208c3997b167a7006dc126361388aa0eb41 Mon Sep 17 00:00:00 2001
From: ecoal95 <ecoal95@gmail.com>
Date: Wed, 17 Jun 2015 06:29:25 +0200
Subject: glx: Unbind the context if it's the current one

---
 src/api/glx/mod.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/api')

diff --git a/src/api/glx/mod.rs b/src/api/glx/mod.rs
index f1eb436..885339f 100644
--- a/src/api/glx/mod.rs
+++ b/src/api/glx/mod.rs
@@ -179,8 +179,10 @@ unsafe impl Sync for Context {}
 impl Drop for Context {
     fn drop(&mut self) {
         unsafe {
-            // we don't call MakeCurrent(0, 0) because we are not sure that the context
-            // is still the current one
+            if self.is_current() {
+                self.glx.MakeCurrent(self.display as *mut _, 0, ptr::null_mut());
+            }
+
             self.glx.DestroyContext(self.display as *mut _, self.context);
         }
     }
-- 
cgit v1.2.3