diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-08-14 13:52:11 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-08-14 13:52:11 +0100 |
commit | eb09a686388b889f67f3a9b2c820575a1cfbc304 (patch) | |
tree | 84c5c16520898bab8978a8d9cd0d4175baf1d121 /src/cairo-xlib-display.c | |
parent | 84a3b6e2d0b8103cdc17558b502ecfc4c99b98a3 (diff) | |
download | cairo-eb09a686388b889f67f3a9b2c820575a1cfbc304.tar.gz |
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/cairo-xlib-display.c')
-rw-r--r-- | src/cairo-xlib-display.c | 5 |
1 files changed, 1 insertions, 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 |