From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 11 Jul 2020 05:32:30 +0000 (+0200)
Subject: Do not attempt to use the output driver while it's being destroyed.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1610f63ae0c6de973de7d35d977c6119eec06f6;p=pspp

Do not attempt to use the output driver while it's being destroyed.
---

diff --git a/src/output/cairo.c b/src/output/cairo.c
index e15cb6114a..bcb995c68c 100644
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -889,9 +889,9 @@ xr_destroy (struct output_driver *driver)
       cairo_surface_finish (xr->surface);
       cairo_status_t status = cairo_status (xr->cairo);
       if (status != CAIRO_STATUS_SUCCESS)
-        msg (ME, _("error drawing output for %s driver: %s"),
-               output_driver_get_name (driver),
-               cairo_status_to_string (status));
+        fprintf (stderr,  _("error drawing output for %s driver: %s"),
+                 output_driver_get_name (driver),
+                 cairo_status_to_string (status));
       cairo_surface_destroy (xr->surface);
 
       cairo_destroy (xr->cairo);
diff --git a/tests/language/stats/examine.at b/tests/language/stats/examine.at
index b7bd3e8ec8..0d9e781488 100644
--- a/tests/language/stats/examine.at
+++ b/tests/language/stats/examine.at
@@ -1268,7 +1268,7 @@ examine x  by g
         /plot = all.
 ])
 dnl This bug only manifested itself on cairo based drivers.
-AT_CHECK([pspp -O format=pdf examine.sps], [1], [ignore], [ignore])
+AT_CHECK([pspp -O format=pdf examine.sps], [0], [ignore], [ignore])
 AT_CLEANUP