fix #73 as a regression to #22

NeuroJSON · Jun 23, 2021 · b1ae5fa · b1ae5fa
1 parent 0a39346
commit b1ae5fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/loadjson.m b/loadjson.m
@@ -114,7 +114,7 @@
     opt.arraytoken_=arraytoken;
     opt.arraytokenidx_=arraytokenidx;
     opt.simplifycell=jsonopt('SimplifyCell',1,opt);
-    opt.simplifycellarray=jsonopt('SimplifyCellArray',0,opt);
+    opt.simplifycellarray=jsonopt('SimplifyCellArray',opt.simplifycell,opt);
     opt.formatversion=jsonopt('FormatVersion',2,opt);
     opt.fastarrayparser=jsonopt('FastArrayParser',1,opt);
     opt.parsestringarray=jsonopt('ParseStringArray',0,opt);
@@ -281,7 +281,7 @@
     end
 
     if(varargin{1}.simplifycell)
-      if(iscell(object) && ~isempty(object) && isnumeric(object{1}))
+      if(iscell(object) && ~isempty(object) && (isnumeric(object{1}) || isstruct(object{1})) )
           if(all(cellfun(@(e) isequal(size(object{1}), size(e)) , object(2:end))))
               try
                   oldobj=object;