From 0394d403976b8cd7d87d7c19abd57bdc2d9651cf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 29 Aug 2015 20:40:52 -0400
Subject: [PATCH] update select server

---
 .../Persistence/CleanDatabaseScheduledTask.cs       | 13 ++++++++++++-
 MediaBrowser.WebDashboard/Api/PackageCreator.cs     |  7 ++-----
 .../MediaBrowser.WebDashboard.csproj                |  3 ---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index d913063c8d..9f87483baa 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -81,7 +81,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
                 if (item != null)
                 {
-                    await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false);
+                    try
+                    {
+                        await _itemRepo.SaveItem(item, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        throw;
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error saving item", ex);
+                    }
                 }
 
                 numComplete++;
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 01e74d0669..dac56d24dd 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -651,13 +651,11 @@ namespace MediaBrowser.WebDashboard.Api
         private async Task<Stream> GetAllCss(bool enableMinification)
         {
             var memoryStream = new MemoryStream();
-            var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
-
-            await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.min.css", newLineBytes).ConfigureAwait(false);
-            await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.min.css", newLineBytes).ConfigureAwait(false);
 
             var files = new[]
                                   {
+                                      "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css",
+                                      "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.structure.css",
                                       "css/site.css",
                                       "css/chromecast.css",
                                       "css/nowplayingbar.css",
@@ -668,7 +666,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "css/card.css",
                                       "css/notifications.css",
                                       "css/search.css",
-                                      "css/pluginupdates.css",
                                       "css/remotecontrol.css",
                                       "css/userimage.css",
                                       "css/nowplaying.css",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 07792b82d4..11b96a869b 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -847,9 +847,6 @@
     <Content Include="dashboard-ui\css\librarybrowser.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\pluginupdates.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\remotecontrol.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>