mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-06-23 15:30:56 -04:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
b4bcb07c38
@ -295,7 +295,7 @@ namespace MediaBrowser.Common.Implementations
|
|||||||
{
|
{
|
||||||
var programDataPath = _useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : Path.Combine(ConfigurationManager.AppSettings["ReleaseProgramDataPath"], ConfigurationManager.AppSettings["ProgramDataFolderName"]);
|
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 it's a relative path, e.g. "..\"
|
||||||
if (!Path.IsPathRooted(programDataPath))
|
if (!Path.IsPathRooted(programDataPath))
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</nlog>
|
</nlog>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
|
<add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
|
||||||
<add key="ReleaseProgramDataPath" value="%CommonApplicationData%" />
|
<add key="ReleaseProgramDataPath" value="%ApplicationData%" />
|
||||||
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
||||||
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
||||||
</appSettings>
|
</appSettings>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user