File r882881.diff of Package kdebase4-workspace

Subject: Fix X crash on disabling compositing
From: wstephenson@suse.de
Bug: kde#174782
Patch-upstream: 882881
--- kwin/scene_opengl.cpp	(revision 882880)
+++ kwin/scene_opengl.cpp	(revision 882881)
@@ -184,6 +184,8 @@ SceneOpenGL::~SceneOpenGL()
     foreach( Window* w, windows )
         delete w;
     // do cleanup after initBuffer()
+    glXMakeCurrent( display(), None, NULL );
+    glXDestroyContext( display(), ctxbuffer );
     if( wspace->overlayWindow())
         {
         if( hasGLXVersion( 1, 3 ))
@@ -205,8 +207,6 @@ SceneOpenGL::~SceneOpenGL()
             glXDestroyPixmap( display(), last_pixmap );
         glXDestroyContext( display(), ctxdrawable );
         }
-    glXMakeCurrent( display(), None, NULL );
-    glXDestroyContext( display(), ctxbuffer );
     checkGLError( "Cleanup" );
     }
 
Index: kwin/scene_opengl.cpp
===================================================================