diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-05-22 22:01:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 22:01:03 +0100 |
| commit | 51fb6e1d2d4ed30ead48400e71706a609547937e (patch) | |
| tree | 18e42025cf00afb98444f36215d6a9a9ed8b15aa /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | d0537a3271ca9294dce1e86af290e2109ba5e15f (diff) | |
| parent | db9d3b8653d865459e5df5a2fba18f0c9462dbb6 (diff) | |
Merge branch 'master' into IsRoot_fix
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 703f8d20d..82995deb3 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1,3 +1,5 @@ +#nullable disable + #pragma warning disable CS1591 using System; @@ -335,10 +337,7 @@ namespace Emby.Server.Implementations { get { - if (_deviceId == null) - { - _deviceId = new DeviceId(ApplicationPaths, LoggerFactory); - } + _deviceId ??= new DeviceId(ApplicationPaths, LoggerFactory); return _deviceId.Value; } @@ -370,10 +369,7 @@ namespace Emby.Server.Implementations /// <returns>System.Object.</returns> protected object CreateInstanceSafe(Type type) { - if (_creatingInstances == null) - { - _creatingInstances = new List<Type>(); - } + _creatingInstances ??= new List<Type>(); if (_creatingInstances.IndexOf(type) != -1) { |