diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-05-21 13:05:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 13:05:03 +0200 |
| commit | d61530eb4b07ec19116773cdae1bb0d4cfa5d3d5 (patch) | |
| tree | f95281f1b7c50e0f69a94a98a52acc682819a511 /Jellyfin.Server/Migrations/Routines | |
| parent | a937a854f2582a8770d9ada7c24375065a21f7a5 (diff) | |
| parent | 7e8428e588b3f0a0574da44081098c64fe1a47d7 (diff) | |
Merge pull request #6083 from Bond-009/nullable4
Enable nullable reference types for Emby.Server.Implementations
Diffstat (limited to 'Jellyfin.Server/Migrations/Routines')
| -rw-r--r-- | Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs index a15a38177..96bd2ccc4 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs @@ -82,11 +82,14 @@ namespace Jellyfin.Server.Migrations.Routines var userDataDir = Path.Combine(_paths.UserConfigurationDirectoryPath, mockup.Name); - var config = File.Exists(Path.Combine(userDataDir, "config.xml")) - ? (UserConfiguration)_xmlSerializer.DeserializeFromFile(typeof(UserConfiguration), Path.Combine(userDataDir, "config.xml")) + var configPath = Path.Combine(userDataDir, "config.xml"); + var config = File.Exists(configPath) + ? (UserConfiguration?)_xmlSerializer.DeserializeFromFile(typeof(UserConfiguration), configPath) ?? new UserConfiguration() : new UserConfiguration(); - var policy = File.Exists(Path.Combine(userDataDir, "policy.xml")) - ? (UserPolicy)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), Path.Combine(userDataDir, "policy.xml")) + + var policyPath = Path.Combine(userDataDir, "policy.xml"); + var policy = File.Exists(policyPath) + ? (UserPolicy?)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), policyPath) ?? new UserPolicy() : new UserPolicy(); policy.AuthenticationProviderId = policy.AuthenticationProviderId?.Replace( "Emby.Server.Implementations.Library", |