diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-27 14:04:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 14:04:39 -0500 |
| commit | b4893b9ac90ea19eb65888d87e73ca260067a999 (patch) | |
| tree | d5d25a931f68c748bec8fd88085a3c4dff0d270d /Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs | |
| parent | b0608d26b492b07f22ed745a7077975da733a780 (diff) | |
| parent | ffe79c89829fb232e8ccb4ae4caf4b732ce51600 (diff) | |
Merge pull request #740 from Bond-009/deadcode
Remove code for pre-installed plugins & properly check if file exists
Diffstat (limited to 'Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs index 59c7c655f..9740f5ee3 100644 --- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs +++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs @@ -246,13 +246,14 @@ namespace Emby.Server.Implementations.AppBase private object LoadConfiguration(string path, Type configurationType) { - try + if (!File.Exists(path)) { - return XmlSerializer.DeserializeFromFile(configurationType, path); + return Activator.CreateInstance(configurationType); } - catch (FileNotFoundException) + + try { - return Activator.CreateInstance(configurationType); + return XmlSerializer.DeserializeFromFile(configurationType, path); } catch (IOException) { |