Catching empty dir cases

tebjan · Oct 27, 2020 · 3f4bbc3 · 3f4bbc3
1 parent 6d948f2
commit 3f4bbc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Stride.ShaderExplorer/MainViewModel.cs b/Stride.ShaderExplorer/MainViewModel.cs
@@ -69,6 +69,7 @@ internal void Refresh()
                         var nugetPackageDir = ResolveNugetPackageDir();
                         var directories = Directory.GetDirectories(nugetPackageDir) //package dir
                             .Where(dir => Path.GetFileName(dir).StartsWith("stride", StringComparison.OrdinalIgnoreCase)) //stride folders
+                            .Where(dir => Directory.EnumerateFileSystemEntries(dir).Any())
                             .Select(dir => Directory.GetDirectories(dir).Where(subdir => !subdir.EndsWith("-dev")) //exclude local build package
                             .OrderBy(subdir2 => subdir2, StringComparer.OrdinalIgnoreCase).LastOrDefault()); //latest version
                         basePath = directories.ToList();
@@ -168,7 +169,8 @@ private static IEnumerable<Shader> ShadersInPostOrder(Shader shader)
 
         private IEnumerable<Shader> BuildShaderTree()
         {
-            var files = Paths.SelectMany(path => Directory.GetFiles(path, "*.sdsl", SearchOption.AllDirectories));
+            var files = Paths.Where(p => p != null && Directory.Exists(p))
+                .SelectMany(path => Directory.GetFiles(path, "*.sdsl", SearchOption.AllDirectories));
             var shaders = new Dictionary<string, Shader>();
 
             foreach (var file in files)

diff --git a/Stride.ShaderExplorer/Properties/AssemblyInfo.cs b/Stride.ShaderExplorer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]