Merge remote-tracking branch 'origin/master'

This commit is contained in:
Patrik J. Braun 2020-02-13 21:51:27 +01:00
commit b6f93ac5c4

View File

@ -41,7 +41,7 @@ export class DiskMangerWorker {
} }
public static async excludeDir(name: string, relativeDirectoryName: string, absoluteDirectoryName: string) { public static async excludeDir(name: string, relativeDirectoryName: string, absoluteDirectoryName: string) {
if (Config.Server.Indexing.excludeFolderList.length === 0 || if (Config.Server.Indexing.excludeFolderList.length === 0 &&
Config.Server.Indexing.excludeFileList.length === 0) { Config.Server.Indexing.excludeFileList.length === 0) {
return false; return false;
} }