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

remote control progress

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-30 15:58:07 -04:00
parent a880a44f4a
commit 3387dac01d
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
View File

@ -156,8 +156,6 @@ namespace MediaBrowser.Controller.Providers
/// <param name="item">The item.</param> /// <param name="item">The item.</param>
private void PopulateBaseItemImages(BaseItem item) private void PopulateBaseItemImages(BaseItem item)
{ {
var screenshotFiles = new List<string>();
// Primary Image // Primary Image
var image = GetImage(item, "folder") ?? var image = GetImage(item, "folder") ??
GetImage(item, "poster") ?? GetImage(item, "poster") ??
@ -231,6 +229,8 @@ namespace MediaBrowser.Controller.Providers
// Screenshot Image // Screenshot Image
image = GetImage(item, "screenshot"); image = GetImage(item, "screenshot");
var screenshotFiles = new List<string>();
if (image != null) if (image != null)
{ {
screenshotFiles.Add(image.FullName); screenshotFiles.Add(image.FullName);

3
MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
View File

@ -308,7 +308,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
RaiseReceiveWebRequest(context); RaiseReceiveWebRequest(context);
await Task.Run(() => await Task.Factory.StartNew(() =>
{ {
try try
{ {
@ -318,6 +318,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{ {
_logger.ErrorException("ProcessRequest failure", ex); _logger.ErrorException("ProcessRequest failure", ex);
} }
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }

1
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -549,6 +549,7 @@ namespace MediaBrowser.WebDashboard.Api
"tileitem.css", "tileitem.css",
"search.css", "search.css",
"pluginupdates.css", "pluginupdates.css",
"remotecontrol.css",
"userimage.css" "userimage.css"
}; };

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -246,6 +246,9 @@
<Content Include="dashboard-ui\css\posteritem.css"> <Content Include="dashboard-ui\css\posteritem.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\css\remotecontrol.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\css\search.css"> <Content Include="dashboard-ui\css\search.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>