Merge remote-tracking branch 'upstream/master' into 3.1.7

This commit is contained in:
crobibero
2020-08-31 08:10:15 -06:00
96 changed files with 2603 additions and 6462 deletions

View File

@@ -2,8 +2,8 @@
using System;
using System.Linq;
using Jellyfin.Data;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Interfaces;
using Microsoft.EntityFrameworkCore;
namespace Jellyfin.Server.Implementations
@@ -130,7 +130,7 @@ namespace Jellyfin.Server.Implementations
foreach (var saveEntity in ChangeTracker.Entries()
.Where(e => e.State == EntityState.Modified)
.Select(entry => entry.Entity)
.OfType<ISavingChanges>())
.OfType<IHasConcurrencyToken>())
{
saveEntity.OnSavingChanges();
}