diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-11 10:42:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-11 10:42:13 -0400 |
| commit | f86e8a415af801c20f4fdf30e0b64019e9b2ad13 (patch) | |
| tree | 6503fcc7786615187c8dd92dc5a89ceadc4afb8b | |
| parent | 77ad0fc3365d9e880a47472f5780796570a06cab (diff) | |
| parent | 7302b9a4be817577fe98da6e8b2b2bf2c37d6f0a (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Common.Implementations/Security/MBRegistration.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.sln | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Common.Implementations/Security/MBRegistration.cs b/MediaBrowser.Common.Implementations/Security/MBRegistration.cs index ca000df19..dbb1b13e1 100644 --- a/MediaBrowser.Common.Implementations/Security/MBRegistration.cs +++ b/MediaBrowser.Common.Implementations/Security/MBRegistration.cs @@ -52,6 +52,7 @@ namespace MediaBrowser.Common.Implementations.Security { //check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) }; + var success = reg.registered; if (!reg.registered) { @@ -73,6 +74,7 @@ namespace MediaBrowser.Common.Implementations.Security using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false)) { reg = jsonSerializer.DeserializeFromStream<RegRecord>(json); + success = true; } if (reg.registered) @@ -91,7 +93,7 @@ namespace MediaBrowser.Common.Implementations.Security } } - return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true }; + return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true, RegError = !success}; } } } diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 4eec81cff..f2b7a612c 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -283,7 +283,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal |