aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server.Implementations
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-11-15 13:09:05 -0700
committercrobibero <cody@robibe.ro>2020-11-15 13:09:05 -0700
commite66d79fc0cf1a1a3554e530adfdd3fa8be6967a5 (patch)
tree109235db7bf8cca0acfb22a0e90f4733c7e0caf7 /Jellyfin.Server.Implementations
parent95a2de757f8142fed4ef19b71ac2d483fa152674 (diff)
parent2f426dfc97677deffb60420078b20a7f5f03977e (diff)
Merge remote-tracking branch 'upstream/master' into http-exception
Diffstat (limited to 'Jellyfin.Server.Implementations')
-rw-r--r--Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
index e71d419e0..334f27f85 100644
--- a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
@@ -54,7 +54,7 @@ namespace Jellyfin.Server.Implementations.Users
var usersReset = new List<string>();
foreach (var resetFile in Directory.EnumerateFiles(_passwordResetFileBaseDir, $"{BaseResetFileName}*"))
{
- SerializablePasswordReset? spr;
+ SerializablePasswordReset spr;
await using (var str = File.OpenRead(resetFile))
{
spr = await JsonSerializer.DeserializeAsync<SerializablePasswordReset>(str).ConfigureAwait(false)