aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities
diff options
context:
space:
mode:
authorTim Hobbs <jesus.tesh@gmail.com>2014-03-20 21:44:00 -0700
committerTim Hobbs <jesus.tesh@gmail.com>2014-03-20 21:44:00 -0700
commit6239bef199795cabdf53aa343e66c8e8a40305ff (patch)
treebc0f8711e24b8c0765d90996deb2302831ab4466 /MediaBrowser.Controller/Entities
parentfc9c9a98486567ea225e97df980c750b55278921 (diff)
parent74d1ffd67689c5203870dbdbfa21a0e4d79f6db1 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.Controller/Entities')
-rw-r--r--MediaBrowser.Controller/Entities/Trailer.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index 2a09536c0..b3d73dc34 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -90,7 +90,9 @@ namespace MediaBrowser.Controller.Entities
if (!string.IsNullOrWhiteSpace(key))
{
- return key + "-trailer";
+ key = key + "-trailer";
+
+ return key;
}
return base.GetUserDataKey();