mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-06-30 03:13:17 +01:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
@@ -32,6 +32,9 @@ namespace MediaBrowser.Controller.Entities
|
||||
People = new List<PersonInfo>();
|
||||
CriticReviews = new List<ItemReview>();
|
||||
Taglines = new List<string>();
|
||||
ScreenshotImagePaths = new List<string>();
|
||||
BackdropImagePaths = new List<string>();
|
||||
ProductionLocations = new List<string>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -731,6 +734,11 @@ namespace MediaBrowser.Controller.Entities
|
||||
/// <returns>List{Video}.</returns>
|
||||
private List<Trailer> LoadLocalTrailers()
|
||||
{
|
||||
if (LocationType != LocationType.FileSystem)
|
||||
{
|
||||
return new List<Trailer>();
|
||||
}
|
||||
|
||||
ItemResolveArgs resolveArgs;
|
||||
|
||||
try
|
||||
@@ -789,6 +797,11 @@ namespace MediaBrowser.Controller.Entities
|
||||
/// <returns>List{Audio.Audio}.</returns>
|
||||
private List<Audio.Audio> LoadThemeSongs()
|
||||
{
|
||||
if (LocationType != LocationType.FileSystem)
|
||||
{
|
||||
return new List<Audio.Audio>();
|
||||
}
|
||||
|
||||
ItemResolveArgs resolveArgs;
|
||||
|
||||
try
|
||||
@@ -847,6 +860,11 @@ namespace MediaBrowser.Controller.Entities
|
||||
/// <returns>List{Video}.</returns>
|
||||
private List<Video> LoadThemeVideos()
|
||||
{
|
||||
if (LocationType != LocationType.FileSystem)
|
||||
{
|
||||
return new List<Video>();
|
||||
}
|
||||
|
||||
ItemResolveArgs resolveArgs;
|
||||
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user