Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 10 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 6b954d110..83f29e58b 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -774,7 +774,16 @@ namespace MediaBrowser.Controller.Entities
                         progress.Report((90 * percent) + 10);
                     });
 
-                    await ((Folder)child).ValidateChildren(innerProgress, cancellationToken, recursive: recursive).ConfigureAwait(false);
+                    await ((Folder) child).ValidateChildren(innerProgress, cancellationToken, recursive).ConfigureAwait(false);
+                }
+                else
+                {
+                    percentages.TryUpdate(child.Id, 1, percentages[child.Id]);
+
+                    var percent = percentages.Values.Sum();
+                    percent /= list.Count;
+
+                    progress.Report((90 * percent) + 10);
                 }
             }));