diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-25 21:33:58 +0100 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2019-01-25 23:32:06 +0100 |
| commit | d1a0497f55c7f41fe9f01bbed328967e381fd394 (patch) | |
| tree | c67c1d3da5af32beac90e8480cf3f8827d042a39 /Jellyfin.Server | |
| parent | e0315b569591b71938829a8f35ac264399ef66bd (diff) | |
Revert "Merge pull request #452 from Bond-009/activitydb"
This reverts commit 48ad18d12baeeb42ec0ec7df9473330dcbc76754, reversing
changes made to fe197415cac19c0e4005c52761c5e7a37b8a4557.
Diffstat (limited to 'Jellyfin.Server')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index fef7de512..c196a3f23 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -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)) { |