commit 992680c8b46d72cbc61888b8439d815bff42986c
author Benjamin Franzke <benjaminfranzke@googlemail.com> Mon Jun 27 10:23:34 2011 +0200
committer Benjamin Franzke <benjaminfranzke@googlemail.com> Mon Jun 27 10:25:12 2011 +0200
tree 4599d74c05f969ad7367c822c70063f9b5f588b9
parent 3a07d9594a60dd84464b30b2d9ffdfc4f219bc5b

egl: Fix Terminate with shared gbm screens

NOTE: This is a candidate for the 7.11 branch.

src/egl/drivers/dri2/egl_dri2.c

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index f9a5eb1..5680c36 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -506,6 +506,8 @@
       return EGL_FALSE;
    }
 
+   dri2_dpy->own_dri_screen = 1;
+
    extensions = dri2_dpy->core->getExtensions(dri2_dpy->dri_screen);
    
    if (dri2_dpy->dri2) {
@@ -576,10 +578,12 @@
    _eglReleaseDisplayResources(drv, disp);
    _eglCleanupDisplay(disp);
 
-   dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
+   if (dri2_dpy->own_dri_screen)
+      dri2_dpy->core->destroyScreen(dri2_dpy->dri_screen);
    if (dri2_dpy->fd)
       close(dri2_dpy->fd);
-   dlclose(dri2_dpy->driver);
+   if (dri2_dpy->driver)
+      dlclose(dri2_dpy->driver);
 
    if (disp->PlatformDisplay == NULL) {
       switch (disp->Platform) {