diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-21 21:05:33 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-21 21:05:33 -0400 |
| commit | 71780d401f9521d7b76ac773e7b048de55ff2380 (patch) | |
| tree | 8024a3c385861b5bec619bf8aaecfda86245c51c /MediaBrowser.Server.Implementations | |
| parent | a3f11aac38f4cd26997fe2b9cc9178380f3c9192 (diff) | |
fix windows restart
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 9 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 26961c490..966c1e037 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1165,7 +1165,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <returns>IEnumerable{VirtualFolderInfo}.</returns> private IEnumerable<VirtualFolderInfo> GetView(string path) { - return _fileSystem.GetFileSystemEntryPaths(path) + return _fileSystem.GetDirectoryPaths(path) .Select(dir => new VirtualFolderInfo { Name = Path.GetFileName(dir), diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs index 5b83d63b1..3ee808bb5 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs @@ -67,10 +67,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV } } - else if (info.ProductionYear != null) + else if (info.IsMovie && info.ProductionYear != null) { name += " (" + info.ProductionYear + ")"; } + else + { + name += " " + info.StartDate.ToString("yyyy-MM-dd"); + } return name; } diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 70a4cb439..d9c3ed7a6 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -1322,8 +1322,9 @@ namespace MediaBrowser.Server.Implementations.Session if (existing.Items.Length > 0) { - _logger.Debug("Reissuing access token"); - return existing.Items[0].AccessToken; + var token = existing.Items[0].AccessToken; + _logger.Debug("Reissuing access token: " + token); + return token; } var newToken = new AuthenticationInfo |