diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-16 15:28:49 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-16 15:28:49 -0400 |
| commit | 3a4befff6ba4445c21c60cc6a0ea11bfe845ba17 (patch) | |
| tree | b118baff614e3a00aa4f2281471ac8310667d262 | |
| parent | c494cb67daad35e099829a09716c6e5e9e866e3a (diff) | |
some fixes for client reporting
| -rw-r--r-- | MediaBrowser.Api/BaseApiService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common.Implementations/Updates/PackageManager.cs | 10 | ||||
| -rw-r--r-- | 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 d3e8339c5..ddc600da9 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 f3ab27293..85edf038e 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 805c9c45e..deec12a36 100644 --- a/MediaBrowser.WebDashboard/Html/dashboard.html +++ b/MediaBrowser.WebDashboard/Html/dashboard.html @@ -33,7 +33,7 @@ </div> <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;"> - <h3>Active Connections</h3> + <h3>Active Users</h3> <div id="divConnections"> </div> </div> |