Backport pull request jellyfin#12134 from jellyfin/release-10.9.z

Only cleanup children on specific exceptions Original-merge: 6cf98d4 Merged-by: crobibero <[email protected]> Backported-by: Joshua M. Boniface <[email protected]>
sjww233 · Jun 23, 2024 · 81e38e7 · 81e38e7
1 parent a13dc9b
commit 81e38e7
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Security;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -370,9 +371,18 @@ private async Task ValidateChildrenInternal2(IProgress<double> progress, bool re
                 {
                     nonCachedChildren = GetNonCachedChildren(directoryService);
                 }
+                catch (IOException ex)
+                {
+                    Logger.LogError(ex, "Error retrieving children from file system");
+                }
+                catch (SecurityException ex)
+                {
+                    Logger.LogError(ex, "Error retrieving children from file system");
+                }
                 catch (Exception ex)
                 {
-                    Logger.LogError(ex, "Error retrieving children folder");
+                    Logger.LogError(ex, "Error retrieving children");
+                    return;
                 }
 
                 progress.Report(ProgressHelpers.RetrievedChildren);