starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-30 04:34:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #452 from Bond-009/activitydb"

Browse Source 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
This commit is contained in:
Erwin de Haan
2019-01-25 21:33:58 +01:00
committed by Bond-009
parent e0315b5695
commit d1a0497f55
10 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Server/Program.cs
View File

@@ -99,7 +99,7 @@ namespace Jellyfin.Server
new SystemEvents(),
new NetworkManager(_loggerFactory, environmentInfo)))
{
await appHost.InitAsync();
appHost.Init();
appHost.ImageProcessor.ImageEncoder = GetImageEncoder(fileSystem, appPaths, appHost.LocalizationManager);
@@ -108,6 +108,7 @@ namespace Jellyfin.Server
await appHost.RunStartupTasks();
// TODO: read input for a stop command
try
{
// Block main thread until shutdown
@@ -166,6 +167,7 @@ namespace Jellyfin.Server
{
Directory.CreateDirectory(programDataPath);
}
string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
if (string.IsNullOrEmpty(configDir))
{