Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-03 12:23:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime errors

Browse source
This commit is contained in:
Bond_009 2023-11-14 22:01:10 +01:00
parent 635d67d458
commit 8ee1525894
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Emby.Server.Implementations/ApplicationHost.cs
View file

@ -310,7 +310,9 @@ namespace Emby.Server.Implementations
{ {
_creatingInstances.Add(type); _creatingInstances.Add(type);
Logger.LogDebug("Creating instance of {Type}", type); Logger.LogDebug("Creating instance of {Type}", type);
return ActivatorUtilities.CreateInstance(ServiceProvider, type); return ServiceProvider is null
? Activator.CreateInstance(type)
: ActivatorUtilities.CreateInstance(ServiceProvider, type);
} }
catch (Exception ex) catch (Exception ex)
{ {

4
src/Jellyfin.Extensions/Json/JsonDefaults.cs
View file

@ -1,5 +1,6 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;
using Jellyfin.Extensions.Json.Converters; using Jellyfin.Extensions.Json.Converters;
namespace Jellyfin.Extensions.Json namespace Jellyfin.Extensions.Json
@ -41,7 +42,8 @@ namespace Jellyfin.Extensions.Json
new JsonNullableStructConverterFactory(), new JsonNullableStructConverterFactory(),
new JsonDateTimeConverter(), new JsonDateTimeConverter(),
new JsonStringConverter() new JsonStringConverter()
} },
TypeInfoResolver = new DefaultJsonTypeInfoResolver()
}; };
private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new(_jsonSerializerOptions) private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new(_jsonSerializerOptions)