Merge logic

This commit is contained in:
Kevin Giszewski
2017-10-03 13:31:43 -04:00
parent f32451fffa
commit e164be1823
@@ -142,15 +142,7 @@ namespace Archetype.Api
[HttpPost]
public object CheckForUpdates()
{
if (!IsItTimeToCheck())
{
return new
{
isUpdateAvailable = false
};
}
if (!ArchetypeGlobalSettings.Instance.CheckForUpdates)
if (!ArchetypeGlobalSettings.Instance.CheckForUpdates || !IsItTimeToCheck())
{
return new
{