# HG changeset patch
# User Rik <rik@octave.org>
# Date 1516217142 28800
# Node ID 3daa67b7a243d93334c324bafd5787cb4956d1ff
# Parent  93219261164da7e125012bcd41ab2019f65d48bb# Parent  60d6914d801be99736991e378749b04322ba6a17
maint: merge stable to default.

diff -r 93219261164d -r 3daa67b7a243 libinterp/corefcn/graphics.cc
--- a/libinterp/corefcn/graphics.cc	Wed Jan 17 17:55:46 2018 +0000
+++ b/libinterp/corefcn/graphics.cc	Wed Jan 17 11:25:42 2018 -0800
@@ -11145,13 +11145,23 @@
     }
   catch (octave::execution_exception& e)
     {
-      error (e, "__go%s__: unable to create graphics handle",
+      error (e, "__go_%s__: unable to create graphics handle",
              go_name.c_str ());
     }
 
   adopt (parent, h);
 
-  xset (h, xargs);
+  try
+    {
+      xset (h, xargs);
+    }
+  catch (octave::execution_exception& e)
+    {
+      delete_graphics_object (h);
+      error (e, "__go_%s__: unable to create graphics handle",
+             go_name.c_str ());
+    }
+
   xcreatefcn (h);
   xinitialize (h);