Handle nil pointer dereference. Fix #2133

navidrome · Feb 1, 2023 · aaf58bb · aaf58bb
1 parent 58c4682
commit aaf58bb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go
@@ -168,7 +168,10 @@ func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time, prog
 
 func isDirEmpty(ctx context.Context, dir string) (bool, error) {
 	children, stats, err := loadDir(ctx, dir)
-	return len(children) == 0 && stats.AudioFilesCount == 0, err
+	if err != nil {
+		return false, err
+	}
+	return len(children) == 0 && stats.AudioFilesCount == 0, nil
 }
 
 func (s *TagScanner) getRootFolderWalker(ctx context.Context) (walkResults, chan error) {