From 3a4befff6ba4445c21c60cc6a0ea11bfe845ba17 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Sat, 16 Mar 2013 15:28:49 -0400 Subject: [PATCH] some fixes for client reporting --- MediaBrowser.Api/BaseApiService.cs | 2 +- .../Updates/PackageManager.cs | 10 +++++++++- MediaBrowser.WebDashboard/Html/dashboard.html | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index d3e8339c58..ddc600da91 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -47,7 +47,7 @@ namespace MediaBrowser.Api var auth = GetAuthorization(request); - if (auth != null) + if (auth != null && auth.ContainsKey("UserId")) { var user = UserManager.GetUserById(new Guid(auth["UserId"])); diff --git a/MediaBrowser.Common.Implementations/Updates/PackageManager.cs b/MediaBrowser.Common.Implementations/Updates/PackageManager.cs index f3ab27293b..85edf038ef 100644 --- a/MediaBrowser.Common.Implementations/Updates/PackageManager.cs +++ b/MediaBrowser.Common.Implementations/Updates/PackageManager.cs @@ -101,7 +101,6 @@ namespace MediaBrowser.Common.Implementations.Updates try { File.Copy(tempFile, target, true); - File.Delete(tempFile); } catch (IOException e) { @@ -109,6 +108,15 @@ namespace MediaBrowser.Common.Implementations.Updates throw; } + try + { + File.Delete(tempFile); + } + catch (IOException e) + { + // Don't fail because of this + _logger.ErrorException("Error deleting temp file {0]", e, tempFile); + } } } diff --git a/MediaBrowser.WebDashboard/Html/dashboard.html b/MediaBrowser.WebDashboard/Html/dashboard.html index 805c9c45e8..deec12a36c 100644 --- a/MediaBrowser.WebDashboard/Html/dashboard.html +++ b/MediaBrowser.WebDashboard/Html/dashboard.html @@ -33,7 +33,7 @@
-

Active Connections

+

Active Users