aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-28 12:59:40 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-28 12:59:40 -0500
commit726cf9697aba40f26223789138fe0858ebb374bc (patch)
treef6186ca203d9aa2abd783b2339a76133b6153ecc /MediaBrowser.Controller
parent5278959edef763bdf0b4d72ace75efd151ab5024 (diff)
sync updates
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/Movies/BoxSet.cs2
-rw-r--r--MediaBrowser.Controller/Providers/DirectoryService.cs5
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 8d3cf9bad..4483c7b0f 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -174,7 +174,7 @@ namespace MediaBrowser.Controller.Entities.Movies
// Need to check Count > 0 for boxsets created prior to the introduction of Shares
if (Shares.Count > 0 && !Shares.Any(i => string.Equals(userId, i.UserId, StringComparison.OrdinalIgnoreCase)))
{
- return false;
+ //return false;
}
return true;
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 74a9c6606..06ea7be02 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -46,6 +46,11 @@ namespace MediaBrowser.Controller.Providers
private Dictionary<string, FileSystemInfo> GetFileSystemDictionary(string path, bool clearCache)
{
+ if (string.IsNullOrWhiteSpace(path))
+ {
+ throw new ArgumentNullException("path");
+ }
+
Dictionary<string, FileSystemInfo> entries;
if (clearCache)