diff libinterp/corefcn/load-save.cc @ 18868:2b82d2f29a7b

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jun 2014 11:56:19 -0400
parents 5bd1ca29c5f0 9a70705dc616
children d5db1019ad4a
line wrap: on
line diff
--- a/libinterp/corefcn/load-save.cc	Thu Jun 26 09:33:38 2014 -0700
+++ b/libinterp/corefcn/load-save.cc	Fri Jun 27 11:56:19 2014 -0400
@@ -265,9 +265,10 @@
               file.clear ();
               file.seekg (0, std::ios::beg);
 
-              std::string tmp = extract_keyword (file, "name");
+              std::string name_val = extract_keyword (file, "name");
+              std::string type_val = extract_keyword (file, "type");
 
-              if (! tmp.empty ())
+              if (name_val.empty () != true && type_val.empty () != true)
                 retval = LS_ASCII;
               else
                 {