Skip to content

Commit 997c4ee

Browse files
committed
Fix recently introduced crashing bug in have_feature_table().
Crashes under Octave when Tablicious is not present at all (present but not loaded worked fine).
1 parent a2ab0f6 commit 997c4ee

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

lib/have_feature_table.m

+14-10
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@
1717
% See https://matpower.org for more info.
1818

1919
TorF = exist('table', 'file') == 2;
20-
if TorF && have_feature('matlab')
21-
vstr = have_feature('matlab', 'vstr');
22-
rdate = have_feature('matlab', 'date');
23-
else
24-
v = ver('tablicious');
25-
if ~isempty(v) && isfield(v, 'Version')
26-
vstr = v.Version;
27-
end
28-
if ~isempty(v) && isfield(v, 'Date')
29-
rdate = v.Date;
20+
vstr = '';
21+
rdate = '';
22+
if TorF
23+
if have_feature('matlab')
24+
vstr = have_feature('matlab', 'vstr');
25+
rdate = have_feature('matlab', 'date');
26+
else
27+
v = ver('tablicious');
28+
if ~isempty(v) && isfield(v, 'Version')
29+
vstr = v.Version;
30+
end
31+
if ~isempty(v) && isfield(v, 'Date')
32+
rdate = v.Date;
33+
end
3034
end
3135
end

0 commit comments

Comments
 (0)