starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-27 11:14:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/DatabaseRefactor

Browse Source
This commit is contained in:
JPVenson
2025-03-25 15:12:48 +00:00
parent ef7f6fc8a9 671d801d9f
commit 850f1c79f1
105 changed files with 1478 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -344,6 +344,11 @@ namespace Emby.Server.Implementations.Session
/// <returns>Task.</returns>
private async Task UpdateNowPlayingItem(SessionInfo session, PlaybackProgressInfo info, BaseItem libraryItem, bool updateLastCheckInTime)
{
if (session is null)
{
return;
}
if (string.IsNullOrEmpty(info.MediaSourceId))
{
info.MediaSourceId = info.ItemId.ToString("N", CultureInfo.InvariantCulture);
@@ -676,6 +681,11 @@ namespace Emby.Server.Implementations.Session
private BaseItem GetNowPlayingItem(SessionInfo session, Guid itemId)
{
if (session is null)
{
return null;
}
var item = session.FullNowPlayingItem;
if (item is not null && item.Id.Equals(itemId))
{
@@ -795,7 +805,11 @@ namespace Emby.Server.Implementations.Session
ArgumentNullException.ThrowIfNull(info);
var session = GetSession(info.SessionId);
var session = GetSession(info.SessionId, false);
if (session is null)
{
return;
}
var libraryItem = info.ItemId.IsEmpty()
? null