Skip to content

Commit b662882

Browse files
author
jmgirard
committed
Changes for v14.01
Fixed a bug where the waitbar() on the review window upon adding annotation files was not closing properly.
1 parent a5bde1d commit b662882

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

fig_launcher.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
% License: https://github.com/jmgirard/CARMA/blob/master/license.txt
44

55
global version;
6-
version = 14.00;
6+
version = 14.01;
77
% Create and center main window
88
defaultBackground = get(0,'defaultUicontrolBackgroundColor');
99
handles.figure_launcher = figure( ...

fig_review.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,14 @@ function addseries_Callback(hObject,~)
330330
handles.axMin = axis_min;
331331
handles.axMax = axis_max;
332332
elseif handles.axMin ~= axis_min || handles.axMax ~= axis_max
333+
delete(w);
333334
msgbox('Annotation files must have the same axis settings to be loaded together.','Error','Error');
334-
waitbar(1);
335335
return;
336336
end
337337
% Check that the import file matches the media file
338338
if ~isempty(handles.AllRatings) && size(handles.AllRatings,1)~=size(ratings,1)
339+
delete(w);
339340
msgbox('Annotation file must have the same bin size as the other annotation files.','Error','Error');
340-
waitbar(1);
341341
return;
342342
else
343343
% Append the new file to the stored data
@@ -349,7 +349,7 @@ function addseries_Callback(hObject,~)
349349
handles.MeanRatings = nanmean(handles.AllRatings,2);
350350
guidata(hObject,handles);
351351
end
352-
waitbar(f/length(filenames));
352+
waitbar(f/length(filenames),w);
353353
end
354354
update_plots(handles);
355355
update_boxplots(handles.figure_review,[]);

0 commit comments

Comments
 (0)