diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-04-08 14:31:18 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-04-08 14:33:04 -0400 |
| commit | 2f0c2b4c660260e1cc34e66fdf0ee6f22115b8b7 (patch) | |
| tree | 7e1c13c0f54b43cca228c2a2fc3af5aced6b7a90 | |
| parent | 8457da7eacb047ca73b02b42f04f971ed7f1002b (diff) | |
update linux iso mounter
| -rw-r--r-- | Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/IEnvironmentInfo.cs | 1 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs index 5da1ae2dc..ad6e35700 100644 --- a/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs +++ b/Emby.Common.Implementations/EnvironmentInfo/EnvironmentInfo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; @@ -75,6 +76,14 @@ namespace Emby.Common.Implementations.EnvironmentInfo } } + public char PathSeparator + { + get + { + return Path.PathSeparator; + } + } + public MediaBrowser.Model.System.Architecture SystemArchitecture { get diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index bbae918a1..fde03e1f2 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -461,7 +461,7 @@ namespace MediaBrowser.Api { var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false); - if (success != null) + if (success == null) { throw new ArgumentException("Invalid user or password entered."); } diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 2c57df97c..4430bfe07 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Model.System void SetProcessEnvironmentVariable(string name, string value); string GetUserId(); string StackTrace { get; } + char PathSeparator { get; } } public enum OperatingSystem diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 54133b718..20681b317 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.697</version> + <version>3.0.698</version> <title>Emby.Common</title> <authors>Emby Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index e59460c94..7b5f348c8 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.697</version> + <version>3.0.698</version> <title>Emby.Server.Core</title> <authors>Emby Team</authors> <owners>ebr,Luke,scottisafool</owners> |