CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-30 15:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

start on content type setting

Browse source
This commit is contained in:
Luke Pulverenti 2014-12-21 13:58:17 -05:00
parent 659128073e
commit 74520804f8
12 changed files with 197 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
View file

@ -208,11 +208,29 @@ namespace MediaBrowser.Common.Implementations.Configuration
lock (_configurationSyncLock)
{
return ConfigurationHelper.GetXmlConfiguration(configurationType, file, XmlSerializer);
return LoadConfiguration(file, configurationType);
}
});
}
private object LoadConfiguration(string path, Type configurationType)
{
try
{
return XmlSerializer.DeserializeFromFile(configurationType, path);
}
catch (FileNotFoundException)
{
return Activator.CreateInstance(configurationType);
}
catch (Exception ex)
{
Logger.ErrorException("Error loading configuration file: {0}", ex, path);
return Activator.CreateInstance(configurationType);
}
}
public void SaveConfiguration(string key, object configuration)
{
var configurationType = GetConfigurationType(key);