diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/ConnectService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserService.cs | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ConnectService.cs b/MediaBrowser.Api/ConnectService.cs index 3a863316b..5a2c04ab6 100644 --- a/MediaBrowser.Api/ConnectService.cs +++ b/MediaBrowser.Api/ConnectService.cs @@ -70,7 +70,7 @@ namespace MediaBrowser.Api public void Delete(DeleteConnectLink request) { - var task = _connectManager.RemoveLink(request.Id); + var task = _connectManager.RemoveConnect(request.Id); Task.WaitAll(task); } diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 8b5395488..fa6f88cc4 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1591,7 +1591,9 @@ namespace MediaBrowser.Api.Playback state.InputFileSize = mediaSource.Size; state.InputBitrate = mediaSource.Bitrate; - if (item is Video) + var video = item as Video; + + if (video != null) { state.IsInputVideo = true; @@ -1608,6 +1610,11 @@ namespace MediaBrowser.Api.Playback { state.InputTimestamp = mediaSource.Timestamp.Value; } + + if (video.IsShortcut) + { + state.MediaPath = File.ReadAllText(video.Path); + } } state.RunTimeTicks = mediaSource.RunTimeTicks; diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index 10595d926..a30ecf7d6 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -290,6 +290,7 @@ namespace MediaBrowser.Api } await _sessionMananger.RevokeUserTokens(user.Id.ToString("N")).ConfigureAwait(false); + await _userManager.DeleteUser(user).ConfigureAwait(false); } |