diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index d9c97ddb1..1bca867a9 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -156,8 +156,6 @@ namespace MediaBrowser.Controller.Providers
/// The item.
private void PopulateBaseItemImages(BaseItem item)
{
- var screenshotFiles = new List();
-
// Primary Image
var image = GetImage(item, "folder") ??
GetImage(item, "poster") ??
@@ -231,6 +229,8 @@ namespace MediaBrowser.Controller.Providers
// Screenshot Image
image = GetImage(item, "screenshot");
+ var screenshotFiles = new List();
+
if (image != null)
{
screenshotFiles.Add(image.FullName);
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
index 023df3177..f4bf501e3 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpServer.cs
@@ -308,7 +308,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
RaiseReceiveWebRequest(context);
- await Task.Run(() =>
+ await Task.Factory.StartNew(() =>
{
try
{
@@ -318,6 +318,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{
_logger.ErrorException("ProcessRequest failure", ex);
}
+
}).ConfigureAwait(false);
}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 6e6bb4cd0..4f7162da7 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -549,6 +549,7 @@ namespace MediaBrowser.WebDashboard.Api
"tileitem.css",
"search.css",
"pluginupdates.css",
+ "remotecontrol.css",
"userimage.css"
};
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 43ccf3926..c87b6f8fc 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -246,6 +246,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest