From eb09a686388b889f67f3a9b2c820575a1cfbc304 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 14 Aug 2011 13:52:11 +0100 Subject: [PATCH] xlib: Move the Display pointer nullify into destroy from finish Oops, should have checked with more than just the one test before claiming victory. Signed-off-by: Chris Wilson --- src/cairo-xlib-display.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c index 59e602de5..3acc89372 100644 --- a/src/cairo-xlib-display.c +++ b/src/cairo-xlib-display.c @@ -177,8 +177,6 @@ _cairo_xlib_display_finish (void *abstract_display) cairo_device_release (&display->base); } - - display->display = NULL; } static void @@ -237,8 +235,7 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes) } CAIRO_MUTEX_UNLOCK (_cairo_xlib_display_mutex); - assert (display != NULL); - + display->display = NULL; /* catch any later invalid access */ cairo_device_destroy (&display->base); /* Return value in accordance with requirements of