Skip to content

Commit 3f4bbc3

Browse files
committed
Catching empty dir cases
1 parent 6d948f2 commit 3f4bbc3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Stride.ShaderExplorer/MainViewModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ internal void Refresh()
6969
var nugetPackageDir = ResolveNugetPackageDir();
7070
var directories = Directory.GetDirectories(nugetPackageDir) //package dir
7171
.Where(dir => Path.GetFileName(dir).StartsWith("stride", StringComparison.OrdinalIgnoreCase)) //stride folders
72+
.Where(dir => Directory.EnumerateFileSystemEntries(dir).Any())
7273
.Select(dir => Directory.GetDirectories(dir).Where(subdir => !subdir.EndsWith("-dev")) //exclude local build package
7374
.OrderBy(subdir2 => subdir2, StringComparer.OrdinalIgnoreCase).LastOrDefault()); //latest version
7475
basePath = directories.ToList();
@@ -168,7 +169,8 @@ private static IEnumerable<Shader> ShadersInPostOrder(Shader shader)
168169

169170
private IEnumerable<Shader> BuildShaderTree()
170171
{
171-
var files = Paths.SelectMany(path => Directory.GetFiles(path, "*.sdsl", SearchOption.AllDirectories));
172+
var files = Paths.Where(p => p != null && Directory.Exists(p))
173+
.SelectMany(path => Directory.GetFiles(path, "*.sdsl", SearchOption.AllDirectories));
172174
var shaders = new Dictionary<string, Shader>();
173175

174176
foreach (var file in files)

Stride.ShaderExplorer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
5252
// übernehmen, indem Sie "*" eingeben:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.2.0.0")]
55-
[assembly: AssemblyFileVersion("1.2.0.0")]
54+
[assembly: AssemblyVersion("1.2.1.0")]
55+
[assembly: AssemblyFileVersion("1.2.1.0")]

0 commit comments

Comments
 (0)