michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2039 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-08 14:18:00 -04:00 committed by GitHub
commit 35927af536
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -13,6 +13,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Channels; using MediaBrowser.Model.Channels;
namespace MediaBrowser.Controller.Entities namespace MediaBrowser.Controller.Entities
@ -882,6 +883,15 @@ namespace MediaBrowser.Controller.Entities
return true; return true;
} }
if (query.IsPlayed.HasValue)
{
if (query.IncludeItemTypes.Length == 1 && query.IncludeItemTypes.Contains(typeof(Series).Name))
{
Logger.Debug("Query requires post-filtering due to IsPlayed");
return true;
}
}
return false; return false;
} }

1
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -81,6 +81,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{typeof (ApplicationException), 500} {typeof (ApplicationException), 500}
}; };
HostConfig.Instance.GlobalResponseHeaders = new Dictionary<string, string>();
HostConfig.Instance.DebugMode = false; HostConfig.Instance.DebugMode = false;
HostConfig.Instance.LogFactory = LogManager.LogFactory; HostConfig.Instance.LogFactory = LogManager.LogFactory;