if we destroy the shader - make sure we do it from the right context!

git-svn-id: https://xpra.org/svn/Xpra/trunk@2947 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Mar 13, 2013 · d6ca08c · d6ca08c
1 parent 2fa12a7
commit d6ca08c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/xpra/gl/gl_window_backing.py b/src/xpra/gl/gl_window_backing.py
@@ -101,8 +101,13 @@ def close(self):
 
     def remove_shader(self):
         if self.yuv_shader:
-            glDisable(GL_FRAGMENT_PROGRAM_ARB)
-            glDeleteProgramsARB(1, self.yuv_shader)
+            drawable = self.gl_init()
+            if drawable:
+                try:
+                    glDisable(GL_FRAGMENT_PROGRAM_ARB)
+                    glDeleteProgramsARB(1, self.yuv_shader)
+                finally:
+                    self.gl_end(drawable)
             self.yuv_shader = None
 
     def gl_begin(self):