bug fix. strfind() behaviour changed between 2015a and 2015b

drbenvincent · Sep 24, 2016 · 27f6276 · 27f6276
1 parent eddd3f6
commit 27f6276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/ddToolbox/addSubFoldersToPath.m b/ddToolbox/addSubFoldersToPath.m
@@ -27,5 +27,6 @@ function addSubFoldersToPath()
 end
 
 function matchFound = isStringMatch(str,pattern)
-matchFound = any(~cellfun('isempty',strfind(str,pattern)));
+matchFound = any(~cellfun('isempty',strfind(str,char(pattern))));
+% 2015a throws error without pattern being a char (ie need char(pattern)).
 end
diff --git a/ddToolbox/ddAnalysisSetUp.m b/ddToolbox/ddAnalysisSetUp.m
@@ -9,11 +9,7 @@ function ddAnalysisSetUp()
 cd(toolboxPath)
 
 % Add subdirectories to Matlab path
-try
-	addSubFoldersToPath()
-catch
-	error('Some error in adding toolbox subpaths')
-end
+addSubFoldersToPath()
 
 % Ensure dependencies are installed and up-to-date.
 dependencies={...