From a09e330d4e3ee9cea57f3568c8684dce66c44142 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 15 Nov 2013 16:31:33 -0500
Subject: Display specials within seasons

---
 MediaBrowser.Controller/Entities/Folder.cs     | 5 +++--
 MediaBrowser.Controller/Entities/TV/Episode.cs | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index dbed0b489..f92e7e3e0 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -796,7 +796,7 @@ namespace MediaBrowser.Controller.Entities
 
             foreach (var tuple in list)
             {
-                if (tasks.Count > 7)
+                if (tasks.Count > 10)
                 {
                     await Task.WhenAll(tasks).ConfigureAwait(false);
                 }
@@ -873,7 +873,8 @@ namespace MediaBrowser.Controller.Entities
                             progress.Report((90 * percent) + 10);
                         }
                     }
-                }));
+
+                }, cancellationToken));
             }
 
             cancellationToken.ThrowIfCancellationRequested();
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 95d346733..5100916ff 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        /// <summary>
+        /// Gets the season in which it aired.
+        /// </summary>
+        /// <value>The aired season.</value>
+        public int? SpecialSeasonNumber { get; set; }
+
         /// <summary>
         /// We want to group into series not show individually in an index
         /// </summary>
-- 
cgit v1.2.3