lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Chris Schneider 2013-03-14 21:43:26 -05:00
commit 064b3d58cc
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@ -182,6 +182,8 @@ namespace MediaBrowser.Api.Playback.Progressive
return ToStaticFileResult(outputPath, isHeadRequest); return ToStaticFileResult(outputPath, isHeadRequest);
} }
Response.AddHeader("Accept-Ranges", "none");
return GetStreamResult(state, isHeadRequest).Result; return GetStreamResult(state, isHeadRequest).Result;
} }

6
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
View File

@ -381,6 +381,7 @@ namespace MediaBrowser.Common.Implementations
if (disposable != null) if (disposable != null)
{ {
Logger.Info("Registering " + disposable.GetType().Name); Logger.Info("Registering " + disposable.GetType().Name);
DisposableParts.Add(disposable); DisposableParts.Add(disposable);
} }
} }
@ -458,7 +459,10 @@ namespace MediaBrowser.Common.Implementations
if (manageLiftime) if (manageLiftime)
{ {
DisposableParts.AddRange(parts.OfType<IDisposable>()); lock (DisposableParts)
{
DisposableParts.AddRange(parts.OfType<IDisposable>());
}
} }
return parts; return parts;

4
MediaBrowser.Controller/Library/DtoBuilder.cs
View File

@ -300,13 +300,13 @@ namespace MediaBrowser.Controller.Library
{ {
var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml(); var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml();
if (fields.Contains(ItemFields.Overview)) if (hasOverview)
{ {
dto.Overview = strippedOverview; dto.Overview = strippedOverview;
} }
// Only supply the html version if there was actually html content // Only supply the html version if there was actually html content
if (fields.Contains(ItemFields.OverviewHtml) && !string.Equals(item.Overview, strippedOverview)) if (hasHtmlOverview)
{ {
dto.OverviewHtml = item.Overview; dto.OverviewHtml = item.Overview;
} }