diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-22 01:52:31 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-22 01:52:31 -0400 |
| commit | 414b1251c791dd914e51a5cfd7afeeaaf912e8a3 (patch) | |
| tree | 06c9d734ba51b92eff336894778c1be329dddc0a /MediaBrowser.Controller/Entities | |
| parent | 5ce3ed2fb47ab35c3e47959126e7656c9054f452 (diff) | |
dlna fixes
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BasePluginFolder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/User.cs | 16 |
2 files changed, 3 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); } } } |
