diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-11-21 17:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:15:36 -0500 |
| commit | bfe88d50576ef98d99890cde6dedf84d3cf9044f (patch) | |
| tree | e45797a21eaf7d5046cdab4bc362099512e24bae /Emby.Server.Implementations/Session | |
| parent | 71ff88284be60fb39a7389e0c4990c94f2207ed4 (diff) | |
| parent | 77695f8abed3156de04c6bb2496c14a2ab3d90a8 (diff) | |
Merge pull request #3034 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Session')
| -rw-r--r-- | Emby.Server.Implementations/Session/HttpSessionController.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Session/SessionManager.cs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Session/HttpSessionController.cs b/Emby.Server.Implementations/Session/HttpSessionController.cs index e1c1bbe2b..e85254420 100644 --- a/Emby.Server.Implementations/Session/HttpSessionController.cs +++ b/Emby.Server.Implementations/Session/HttpSessionController.cs @@ -117,6 +117,10 @@ namespace Emby.Server.Implementations.Session { dict["SubtitleStreamIndex"] = command.SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture); } + if (command.StartIndex.HasValue) + { + dict["StartIndex"] = command.StartIndex.Value.ToString(CultureInfo.InvariantCulture); + } if (!string.IsNullOrWhiteSpace(command.MediaSourceId)) { dict["MediaSourceId"] = command.MediaSourceId; diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 30f6e6521..411781b25 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1423,7 +1423,7 @@ namespace Emby.Server.Implementations.Session if (enforcePassword) { - var result = await _userManager.AuthenticateUser(request.Username, request.Password, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false); + var result = await _userManager.AuthenticateUser(request.Username, request.Password, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint, true).ConfigureAwait(false); if (result == null) { |