xserver: Branch 'master'

[George Sapountzis]

 GL/glx/glxext.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f17e3c34dfd1f1418440bdebf45764e4dbf550f0 (from ae3c9ad4abe66784d7ee474455003d2745699286)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Thu Nov 16 02:18:03 2006 +0200

    Fix GL context destruction with AIGLX.
    
    The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
    inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().

diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 11fb7fc..1f6c7f3 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -237,7 +237,7 @@ GLboolean __glXFreeContext(__GLXcontext 
      * __glXDispatch() or as a callback from the resource manager.  In
      * the latter case we need to lift the DRI lock manually. */
 
-    if (glxBlockClients) {
+    if (!glxBlockClients) {
 	__glXleaveServer();
 	cx->destroy(cx);
 	__glXenterServer();