alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fixes #347 - File Properties in Video file formats override local xml

Browse Source
This commit is contained in:
Luke Pulverenti
2013-06-13 14:45:58 -04:00
parent a2557d7981
commit a4f7eb84cd
9 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
return false;
}));
var trailers = LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
@@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities
}
return video;
}).ToList();
return trailers;
}).ToList();
}
/// <summary>