diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-07 13:08:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-07 13:08:08 -0400 |
| commit | b4bcb07c38b25d54fbf81e6abc3009cde9f80da9 (patch) | |
| tree | 8ce15391c4481f8d2086bf2744e635603b746560 | |
| parent | 8295f15ab83709e73da5507d74a4fd8d819b9de9 (diff) | |
| parent | 67f2b1b2bacee5ef3272076e84b1bf305f9b69c7 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Common.Implementations/BaseApplicationPaths.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/App.config | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs index 0bd8b9df8..82a35fc51 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs @@ -295,7 +295,7 @@ namespace MediaBrowser.Common.Implementations { var programDataPath = _useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : Path.Combine(ConfigurationManager.AppSettings["ReleaseProgramDataPath"], ConfigurationManager.AppSettings["ProgramDataFolderName"]); - programDataPath = programDataPath.Replace("%CommonApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)); + programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)); // If it's a relative path, e.g. "..\" if (!Path.IsPathRooted(programDataPath)) diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config index 2d47c4bea..ca35b353c 100644 --- a/MediaBrowser.ServerApplication/App.config +++ b/MediaBrowser.ServerApplication/App.config @@ -11,7 +11,7 @@ </nlog> <appSettings> <add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" /> - <add key="ReleaseProgramDataPath" value="%CommonApplicationData%" /> + <add key="ReleaseProgramDataPath" value="%ApplicationData%" /> <add key="ProgramDataFolderName" value="MediaBrowser-Server" /> <add key="ClientSettingsProvider.ServiceUri" value="" /> </appSettings> |