diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-03-22 17:05:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 17:05:44 +0000 |
| commit | 5d16d1f66de499022da3eeb484a2cdfe341bed2f (patch) | |
| tree | ac348fc960f2c849d989a6d2f27a34a73d4f3675 /Jellyfin.Server/Program.cs | |
| parent | 7fa525c83b7573e61124fa1c64a3b27569e66b6d (diff) | |
| parent | 0853d1265c99a2e8614aa0c7a584dff541484e19 (diff) | |
Merge branch 'master' into RemoteAccessFix
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 6ae0542c0..4f203b7a9 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -222,7 +222,7 @@ namespace Jellyfin.Server } finally { - appHost?.Dispose(); + appHost.Dispose(); } if (_restartOnShutdown) @@ -623,7 +623,7 @@ namespace Jellyfin.Server string commandLineArgsString; if (options.RestartArgs != null) { - commandLineArgsString = options.RestartArgs ?? string.Empty; + commandLineArgsString = options.RestartArgs; } else { |