dlna fixes

3 files changed, 12 insertions, 15 deletions

diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index 67fd8d1428..e1383923f6 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Entities
             DisplayMediaType = "CollectionFolder";
         }
 
-        public string CollectionType
+        public virtual string CollectionType
         {
             get { return Model.Entities.CollectionType.BoxSets; }
         }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 18c5eb48c1..b9c419722d 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Serialization;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Threading;
@@ -222,22 +221,11 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <summary>
-        /// Saves the current configuration to the file system
-        /// </summary>
-        public void SaveConfiguration()
-        {
-            var xmlPath = ConfigurationFilePath;
-            Directory.CreateDirectory(System.IO.Path.GetDirectoryName(xmlPath));
-            XmlSerializer.SerializeToFile(Configuration, xmlPath);
-        }
-
-        /// <summary>
         /// Updates the configuration.
         /// </summary>
         /// <param name="config">The config.</param>
-        /// <param name="serializer">The serializer.</param>
         /// <exception cref="System.ArgumentNullException">config</exception>
-        public void UpdateConfiguration(UserConfiguration config, IXmlSerializer serializer)
+        public void UpdateConfiguration(UserConfiguration config)
         {
             if (config == null)
             {
@@ -245,7 +233,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             Configuration = config;
-            SaveConfiguration();
+            UserManager.UpdateConfiguration(this, Configuration);
         }
     }
 }
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 0a0174b6de..010caa2337 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Events;
 using System;
 using System.Collections.Generic;
@@ -29,6 +30,14 @@ namespace MediaBrowser.Controller.Library
         event EventHandler<GenericEventArgs<User>> UserDeleted;
 
         event EventHandler<GenericEventArgs<User>> UserCreated;
+        event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
+
+        /// <summary>
+        /// Updates the configuration.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="newConfiguration">The new configuration.</param>
+        void UpdateConfiguration(User user, UserConfiguration newConfiguration);
         
         /// <summary>
         /// Gets a User by Id