diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-14 01:44:41 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-14 01:44:41 -0500 |
| commit | 68d2add6d253016e756facfd1e99246ef0d9e833 (patch) | |
| tree | a7e8e407e136d97c6bbc9f094d35f670de26980e | |
| parent | 9b5a4c22e33db6d2e4554a61c49d7f6bf3375e24 (diff) | |
| parent | 6525d64aa8f4fdcea64406386887c9869ebfccdf (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
| -rw-r--r-- | MediaBrowser.Server.Mac/MacAppHost.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/Main.cs | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs index 9e068acd4..054913d4d 100644 --- a/MediaBrowser.Server.Mac/MacAppHost.cs +++ b/MediaBrowser.Server.Mac/MacAppHost.cs @@ -50,7 +50,7 @@ namespace MediaBrowser.Server.Mac break; } - info.DownloadUrls = GetDownloadUrls(environment); + info.DownloadUrls = GetDownloadUrls(); return info; } @@ -72,7 +72,7 @@ namespace MediaBrowser.Server.Mac protected override void RestartInternal() { - MainClass.Restart(StartupOptions); + MainClass.Restart(); } protected override List<Assembly> GetAssembliesWithPartsInternal() diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index 9e7447683..a3023b82c 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Logging; -using MediaBrowser.Server.Mono.Native; using MediaBrowser.Server.Startup.Common; using MediaBrowser.Server.Startup.Common.IO; using MediaBrowser.Server.Implementations; @@ -22,11 +21,13 @@ using MonoMac.Foundation; using MonoMac.ObjCRuntime; using Emby.Server.Core; using Emby.Common.Implementations.Logging; +using Emby.Common.Implementations.EnvironmentInfo; using Emby.Server.Mac.Native; using Emby.Server.Implementations.IO; using Emby.Common.Implementations.Networking; using Emby.Common.Implementations.Security; using Mono.Unix.Native; +using MediaBrowser.Model.System; namespace MediaBrowser.Server.Mac { @@ -298,7 +299,10 @@ namespace MediaBrowser.Server.Mac class NoCheckCertificatePolicy : ICertificatePolicy { - public bool CheckValidationResult (ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem) + public bool CheckValidationResult (ServicePoint srvPoint, + System.Security.Cryptography.X509Certificates.X509Certificate certificate, + WebRequest request, + int certificateProblem) { return true; } |