1 files changed, 17 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index c47eb82de..4060bec3d 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -95,14 +95,29 @@ namespace MediaBrowser.Server.Implementations.Intros
                 }));
             }
 
-            if (config.EnableIntrosFromUpcomingTrailers && IsSupporter)
+            var trailerTypes = new List<TrailerType>();
+
+            if (config.EnableIntrosFromUpcomingTrailers)
+            {
+                trailerTypes.Add(TrailerType.ComingSoonToTheaters);
+            }
+            if (config.EnableIntrosFromUpcomingDvdMovies)
+            {
+                trailerTypes.Add(TrailerType.ComingSoonToDvd);
+            }
+            if (config.EnableIntrosFromUpcomingStreamingMovies)
+            {
+                trailerTypes.Add(TrailerType.ComingSoonToStreaming);
+            }
+
+            if (trailerTypes.Count > 0 && IsSupporter)
             {
                 var channelTrailers = await _channelManager.GetAllMediaInternal(new AllChannelMediaQuery
                 {
                     ContentTypes = new[] { ChannelMediaContentType.MovieExtra },
                     ExtraTypes = new[] { ExtraType.Trailer },
                     UserId = user.Id.ToString("N"),
-                    TrailerTypes = new[] { TrailerType.ComingSoonToTheaters }
+                    TrailerTypes = trailerTypes.ToArray()
 
                 }, CancellationToken.None);