Merge pull request #6 from jellyfin/master

Bringing my branch up to sync

1 files changed, 4 insertions, 4 deletions

diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index c4fa68cac..c7f92b80b 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -66,7 +66,7 @@ namespace Emby.Server.Implementations.Configuration
         {
             base.AddParts(factories);
 
-            UpdateTranscodingTempPath();
+            UpdateTranscodePath();
         }
 
         /// <summary>
@@ -87,13 +87,13 @@ namespace Emby.Server.Implementations.Configuration
         /// <summary>
         /// Updates the transcoding temporary path.
         /// </summary>
-        private void UpdateTranscodingTempPath()
+        private void UpdateTranscodePath()
         {
             var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
 
             ((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
                 null :
-                Path.Combine(encodingConfig.TranscodingTempPath, "transcoding-temp");
+                Path.Combine(encodingConfig.TranscodingTempPath, "transcodes");
         }
 
         protected override void OnNamedConfigurationUpdated(string key, object configuration)
@@ -102,7 +102,7 @@ namespace Emby.Server.Implementations.Configuration
 
             if (string.Equals(key, "encoding", StringComparison.OrdinalIgnoreCase))
             {
-                UpdateTranscodingTempPath();
+                UpdateTranscodePath();
             }
         }