Merge remote-tracking branch 'remotes/origin/development' (666ab6d0) · Commits · github_fork / Homer3

DataTree/DataTreeClass.m

+3 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,9 @@ classdef DataTreeClass < handle
		while dataInit.GetError() < 0
		dataInit = FindFiles(obj.dirnameGroups{kk}, fmt, options);
		if isempty(dataInit) \|\| dataInit.IsEmpty()
		if ~isempty(dataInit)
		obj.filesErr = dataInit.filesErr;
		end
		ErrorCheckLoadedFiles(obj);
		return;
		end

+1 −1

+4 −4

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ cd(currdir)

		% ------------------------------------------------------------
		function main()
		global h %#ok<*GVMIS>
		global h
		global nSteps
		global iStep
		global platform
		@@ -61,7 +61,7 @@ logger = Logger([dirnameSrc, 'Setup']);

		[~, exename] = getAppname();

		v = getVernum();
		v = getVernum(exename);
		logger.Write('==========================================\n');
		logger.Write('Setup script for %s v%s:\n', exename, v);
		logger.Write('==========================================\n\n');
		@@ -136,7 +136,7 @@ catch ME
		msg{1} = sprintf('Error: Could not remove old installation folder %s. It might be in use by other applications.\n', dirnameDst);
		msg{2} = sprintf('Try closing and reopening file browsers or any other applications that might be using the\n');
		msg{3} = sprintf('installation folder and then retry installation.');
		menu([msg{:}], 'OK');
		MenuBox(msg, 'OK');
		pause(5);
		rethrow(ME)
		end
		@@ -281,7 +281,7 @@ try
		end
		catch ME
		msg{1} = sprintf('Error: Could not create %s shortcuts on Desktop. Exiting installation.', exename);
		menu([msg{:}], 'OK');
		MenuBox(msg, 'OK');
		printStack(ME)
		return;
		end

+1 −1