aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2019-04-20 12:25:29 +0200
committerGitHub <noreply@github.com>2019-04-20 12:25:29 +0200
commita8da122fb3c9c1f66f43da01099fb6aa86d554c6 (patch)
tree12fbf29535844df988492d06420beadab0ac190c /Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
parent7bea62adbfc7350c01a222cb92c86c13c0b43412 (diff)
parent46c37c0ae8d5b5de02ff6f8208a7b91436f54237 (diff)
Merge pull request #1252 from jellyfin/release-10.3.z
Backmerge release 10.3.0
Diffstat (limited to 'Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs')
-rw-r--r--Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs13
1 files changed, 2 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 18e279c2f..c4fa68cac 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -74,23 +74,14 @@ namespace Emby.Server.Implementations.Configuration
/// </summary>
private void UpdateMetadataPath()
{
- string metadataPath;
-
if (string.IsNullOrWhiteSpace(Configuration.MetadataPath))
{
- metadataPath = GetInternalMetadataPath();
+ ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
}
else
{
- metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
+ ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = Configuration.MetadataPath;
}
-
- ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
- }
-
- private string GetInternalMetadataPath()
- {
- return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
}
/// <summary>