Skip to content

Commit 63f3dae

Browse files
committed
Merge branch 'master' of https://github.com/RNA-FRETools/MASH-FRET into autosort-snr
2 parents 61a8f11 + 9e4bd28 commit 63f3dae

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

MASH-FRET/source/mod-transition-analysis/state-lifetime/getDtHist.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
hist_ref = [];
44

55
% check for at least one/two transition in histogram
6+
if isempty(clust_dat)
7+
return
8+
end
69
if j2==0
710
clust_k = clust_dat(clust_dat(:,7)==j1,:);
811
else

MASH-FRET/source/project/_callbacks/pushbutton_closeProj_Callback.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function pushbutton_closeProj_Callback(obj, evd, h_fig, varargin)
77

88
% adjust current project index in case it is out of list range (can happen
99
% when project import failed)
10-
setcurrproj(h_fig);
1110

1211
h = guidata(h_fig);
1312
p = h.param;
@@ -78,8 +77,8 @@ function pushbutton_closeProj_Callback(obj, evd, h_fig, varargin)
7877
end
7978

8079
% update current project, molecule index, data type and molecule subgroup
81-
p.proj(slct) = [];
8280
p = adjustProjIndexLists(p,-slct,[]);
81+
p.proj(slct) = [];
8382

8483
% set new current project
8584
if size(p.proj,2) <= 1

0 commit comments

Comments
 (0)