Merge remote-tracking branch 'remotes/origin/development'

BUNPC · May 25, 2023 · 666ab6d · 666ab6d
2 parents 571410e + e5a5a8a
commit 666ab6d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/DataTree/DataTreeClass.m b/DataTree/DataTreeClass.m
@@ -267,7 +267,9 @@ function FindAndLoadGroups(obj, groupDirs, fmt, procStreamCfgFile, options)
                     while dataInit.GetError() < 0
                         dataInit = FindFiles(obj.dirnameGroups{kk}, fmt, options);
                         if isempty(dataInit) || dataInit.IsEmpty()
-                            obj.filesErr = dataInit.filesErr;
+                            if ~isempty(dataInit)
+                                obj.filesErr = dataInit.filesErr;
+                            end
                             ErrorCheckLoadedFiles(obj);
                             return;
                         end

diff --git a/DataTree/Version.txt b/DataTree/Version.txt
@@ -1 +1 @@
-1.15.1
+1.15.2
diff --git a/Install/setup.m b/Install/setup.m
@@ -43,7 +43,7 @@ function setup()
 
 % ------------------------------------------------------------
 function main()
-global h            %#ok<*GVMIS> 
+global h
 global nSteps
 global iStep
 global platform
@@ -61,7 +61,7 @@ function main()
 
 [~, 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 @@ function main()
     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 @@ function createDesktopShortcuts(dirnameSrc, dirnameDst)
     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

diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-1.80.1
+1.80.2