aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorEric Reed <ebr@mediabrowser3.com>2014-01-30 00:08:56 -0500
committerEric Reed <ebr@mediabrowser3.com>2014-01-30 00:08:56 -0500
commit0110f22b78a44140dd7f081b3c83a3ff82e9b63a (patch)
tree31df11ab68146cecbbace559e602d5cf9271c1db /MediaBrowser.Controller
parent8c63515c4524f0022bf8cad8ff9da26004c3a911 (diff)
parent1f6918117c2a7542e066ffb5ac09051a698bb136 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/Movies/Movie.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index dbbe5ce01..a4e885337 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -159,7 +159,8 @@ namespace MediaBrowser.Controller.Entities.Movies
try
{
- folder = ResolveArgs.GetFileSystemEntryByName("specials");
+ folder = ResolveArgs.GetFileSystemEntryByName("extras") ??
+ ResolveArgs.GetFileSystemEntryByName("specials");
}
catch (IOException ex)
{