diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:52 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:52 -0500 |
| commit | d5c7845917bd15a945aacb92f50db6502123ad9a (patch) | |
| tree | b4f9ecfd2d716733ff04406d9360d084ec11cf18 /Emby.Server.Core | |
| parent | cf57e8193c5108804724dd55242a56e03b907ed7 (diff) | |
| parent | 23010f2980381a4b56e05620d4604cafc0e00043 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/Emby
Diffstat (limited to 'Emby.Server.Core')
| -rw-r--r-- | Emby.Server.Core/HttpServerFactory.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Core/Localization/TextLocalizer.cs | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Emby.Server.Core/HttpServerFactory.cs b/Emby.Server.Core/HttpServerFactory.cs index 8ec5fb026..deed3c6f3 100644 --- a/Emby.Server.Core/HttpServerFactory.cs +++ b/Emby.Server.Core/HttpServerFactory.cs @@ -76,9 +76,9 @@ namespace Emby.Server.Core public class StreamFactory : IStreamFactory { - public Stream CreateNetworkStream(ISocket socket, bool ownsSocket) + public Stream CreateNetworkStream(IAcceptSocket acceptSocket, bool ownsSocket) { - var netSocket = (NetSocket)socket; + var netSocket = (NetAcceptSocket)acceptSocket; return new NetworkStream(netSocket.Socket, ownsSocket); } diff --git a/Emby.Server.Core/Localization/TextLocalizer.cs b/Emby.Server.Core/Localization/TextLocalizer.cs index 6690c6263..1e8ccbbfa 100644 --- a/Emby.Server.Core/Localization/TextLocalizer.cs +++ b/Emby.Server.Core/Localization/TextLocalizer.cs @@ -39,7 +39,15 @@ namespace Emby.Server.Core.Localization } } - return text.Normalize(form); + try + { + return text.Normalize(form); + } + catch (ArgumentException) + { + // if it still fails, return the original text + return text; + } } private static string StripInvalidUnicodeCharacters(string str) |