]> git.sesse.net Git - vlc/commitdiff
opengl: release current context before destroying it
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 30 May 2013 15:42:33 +0000 (18:42 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 4 Jun 2013 17:55:06 +0000 (20:55 +0300)
modules/video_output/gl.c

index b31b3ac84b0488c5fc9d75381cee3458d7455174..cf7c624912352452e0aeea0f34036a7c8bbe090e 100644 (file)
@@ -158,7 +158,10 @@ static int Open (vlc_object_t *obj)
     const vlc_fourcc_t *spu_chromas;
     sys->vgl = vout_display_opengl_New (&vd->fmt, &spu_chromas, sys->gl);
     if (!sys->vgl)
+    {
+        vlc_gl_ReleaseCurrent (sys->gl);
         goto error;
+    }
 
     vd->sys = sys;
     vd->info.has_pictures_invalid = false;
@@ -189,6 +192,8 @@ static void Close (vlc_object_t *obj)
     vout_display_sys_t *sys = vd->sys;
 
     vout_display_opengl_Delete (sys->vgl);
+    vlc_gl_ReleaseCurrent (sys->gl);
+
     vlc_gl_Destroy (sys->gl);
     vout_display_DeleteWindow (vd, sys->window);
     free (sys);