Merge pull request #1043 from MediaBrowser/dev

3.0.5557.0

1 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
index 2fe5d8f742..566f4c5f40 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
+using System;
 using System.IO;
 using System.Linq;
 
@@ -14,6 +15,11 @@ namespace MediaBrowser.Server.Implementations.Devices
 
         public override bool IsVisible(User user)
         {
+            if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+            
             return GetChildren(user, true).Any() &&
                 base.IsVisible(user);
         }