Mercurial > octave

changeset 24422:fc6354114864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Sat, 16 Dec 2017 18:41:41 -0800
parents e1390a99a993 (current diff) 13344f00c564 (diff)
children 1d52db450db4
files libinterp/corefcn/graphics.cc scripts/io/dlmwrite.m
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Sat Dec 16 08:22:36 2017 -0800
+++ b/libinterp/corefcn/graphics.cc	Sat Dec 16 18:41:41 2017 -0800
@@ -1732,7 +1732,7 @@
     {
       graphics_object go = gh_manager::get_object (hchild);
 
-      if (go.valid_object ())
+      if (go.valid_object () && ! go.get_properties ().is_beingdeleted ())
         gh_manager::free (hchild);
     }
 
--- a/scripts/io/dlmwrite.m	Sat Dec 16 08:22:36 2017 -0800
+++ b/scripts/io/dlmwrite.m	Sat Dec 16 18:41:41 2017 -0800
@@ -160,7 +160,7 @@
 
   if (ischar (file))
     [fid, msg] = fopen (file, opentype);
-  elseif (isscalar (file) && isnumeric (file))
+  elseif (is_valid_file_id (file))
     [fid, msg] = deal (file, "invalid file number");
   else
     error ("dlmwrite: FILE must be a filename string or numeric FID");
@@ -194,7 +194,7 @@
     else
       fprintf (fid, template, M.');
     endif
-    if (! isscalar (file))
+    if (ischar (file))
       fclose (fid);
     endif
   endif