diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index e7593b075..1d38b3728 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1359,13 +1359,24 @@ namespace MediaBrowser.Controller.Entities Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path); } - //this should be functionally equivilent to what was here since it is IEnum and works on a thread-safe copy return RecursiveChildren.Where(i => i.LocationType != LocationType.Virtual).FirstOrDefault(i => { try { - return string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase) - || i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase); + if (string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + if (i.LocationType != LocationType.Remote) + { + if (i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase)) + { + return true; + } + } + + return false; } catch (IOException ex) { |