diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-04 21:49:08 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-04 21:49:08 -0500 |
| commit | 52a2ff5a2ee8cac36182bb56913e18d0e0f6f745 (patch) | |
| tree | 20c63746423ddeffcb255c912bb4fa566b13e0c4 /MediaBrowser.Controller/Entities | |
| parent | a23c23f27b5300172756e2869217e9d4d79dc7c9 (diff) | |
updated image magick sharp
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/LinkedChild.cs | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 50a6dda305..7a13bfc1c0 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1245,13 +1245,6 @@ namespace MediaBrowser.Controller.Entities { if (string.Equals(i.GetType().Name, info.ItemType, StringComparison.OrdinalIgnoreCase)) { - if (info.ItemYear.HasValue) - { - if (info.ItemYear.Value != (i.ProductionYear ?? -1)) - { - return false; - } - } return true; } } diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 0d9bb03acf..cffc0989a5 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1135,10 +1135,7 @@ namespace MediaBrowser.Controller.Entities foreach (var child in LinkedChildren) { // Reset the cached value - if (child.ItemId.HasValue && child.ItemId.Value == Guid.Empty) - { - child.ItemId = null; - } + child.ItemId = null; } return false; diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs index 78e8e49594..949c9741b1 100644 --- a/MediaBrowser.Controller/Entities/LinkedChild.cs +++ b/MediaBrowser.Controller/Entities/LinkedChild.cs @@ -11,7 +11,6 @@ namespace MediaBrowser.Controller.Entities public string ItemName { get; set; } public string ItemType { get; set; } - public int? ItemYear { get; set; } [IgnoreDataMember] public string Id { get; set; } |