Merge branch 'master' into nullable3

2026-05-25 10:07:15 +01:00 · 2020-04-15 11:09:14 +02:00
parent 9cca964b08 2eb5775ee3
commit fc049caba2
113 changed files with 1607 additions and 3305 deletions
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -253,12 +253,7 @@ namespace MediaBrowser.Api
                    return false;
                }

-                if (!request.IncludeDirectories && isDirectory)
-                {
-                    return false;
-                }
-
-                return true;
+                return request.IncludeDirectories || !isDirectory;
            });

            return entries.Select(f => new FileSystemEntryInfo(f.Name, f.FullName, f.IsDirectory ? FileSystemEntryType.Directory : FileSystemEntryType.File));