Merge pull request #2819 from StephenHodgson/vNEXT-RelativePathFix

David Kline · web-flow · commit fc43727b5c40 · 2018-09-24T18:35:13.000-07:00
MRTK relative folder matching fix.
diff --git a/Assets/MixedRealityToolkit/_Core/Utilities/Editor/Setup/EnforceEditorSettings.cs b/Assets/MixedRealityToolkit/_Core/Utilities/Editor/Setup/EnforceEditorSettings.cs
@@ -174,7 +174,9 @@ private static bool FindDirectory(string directoryPathToSearch, string directory
 
             for (int i = 0; i < directories.Length; i++)
             {
-                if (directories[i].Contains(directoryName))
+                var name = Path.GetFileName(directories[i]);
+
+                if (name != null && name.Equals(directoryName))
                 {
                     path = directories[i];
                     return true;

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,9 @@ private static bool FindDirectory(string directoryPathToSearch, string directory`
`174`	`174`
`175`	`175`	`for (int i = 0; i < directories.Length; i++)`
`176`	`176`	`{`
`177`		`- if (directories[i].Contains(directoryName))`
	`177`	`+ var name = Path.GetFileName(directories[i]);`
	`178`	`+`
	`179`	`+ if (name != null && name.Equals(directoryName))`
`178`	`180`	`{`
`179`	`181`	`path = directories[i];`
`180`	`182`	`return true;`