[vlc-commits] commit: GLX: destroy context before window ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May  1 20:58:26 2010 +0300| [6daff47a5855577fabfb599b33bd20c981eb69f5] | committer: Rémi Denis-Courmont 

GLX: destroy context before window

(cherry picked from commit e9117abcc258fbef86cf5ea57a9d44964d524d02)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6daff47a5855577fabfb599b33bd20c981eb69f5
---

 modules/video_output/xcb/glx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 573ea24..b67c8b5 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -414,13 +414,12 @@ static void Close (vlc_object_t *obj)
     if (sys->ctx != NULL)
     {
         if (sys->v1_3)
-        {
             glXMakeContextCurrent (dpy, None, None, NULL);
-            glXDestroyWindow (dpy, sys->glwin);
-        }
         else
             glXMakeCurrent (dpy, None, NULL);
         glXDestroyContext (dpy, sys->ctx);
+        if (sys->v1_3)
+            glXDestroyWindow (dpy, sys->glwin);
     }
 
     /* show the default cursor */