made display preferences uniquely identifiable

2 files changed, 12 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index c64f001c11..42c112752e 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Tasks;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -35,7 +34,7 @@ namespace MediaBrowser.Controller.Entities
         /// Allow different display preferences for each collection folder
         /// </summary>
         /// <value>The display prefs id.</value>
-        public override Guid DisplayPreferencesId
+        protected override Guid DisplayPreferencesId
         {
             get
             {
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 05ee87defa..ce8bf679ea 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The display prefs id.</value>
         [IgnoreDataMember]
-        public virtual Guid DisplayPreferencesId
+        protected virtual Guid DisplayPreferencesId
         {
             get
             {
@@ -74,6 +74,16 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        /// <summary>
+        /// Gets the display preferences id.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <returns>Guid.</returns>
+        public Guid GetDisplayPreferencesId(Guid userId)
+        {
+            return (userId + DisplayPreferencesId.ToString()).GetMD5();
+        }
+
         #region Indexing
 
         /// <summary>