diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs index c13abc611..279021fd3 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs @@ -32,6 +32,9 @@ namespace ShareX.HelpersLib { public abstract class UpdateChecker { + /// For testing purposes. + public static bool ForceUpdate { get; set; } = false; + public UpdateStatus Status { get; set; } public Version CurrentVersion { get; set; } public Version LatestVersion { get; set; } @@ -61,8 +64,6 @@ public string Filename public string DownloadURL { get; set; } - private const bool forceUpdate = false; // For testing purposes - public void RefreshStatus() { if (CurrentVersion == null) @@ -71,7 +72,7 @@ public void RefreshStatus() } if (Status != UpdateStatus.UpdateCheckFailed && CurrentVersion != null && LatestVersion != null && !string.IsNullOrEmpty(DownloadURL) && - (forceUpdate || Helpers.CompareVersion(CurrentVersion, LatestVersion) < 0 || (IsBeta && Helpers.CompareVersion(CurrentVersion, LatestVersion) == 0))) + (ForceUpdate || Helpers.CompareVersion(CurrentVersion, LatestVersion) < 0 || (IsBeta && Helpers.CompareVersion(CurrentVersion, LatestVersion) == 0))) { Status = UpdateStatus.UpdateAvailable; } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 6866e9489..8b521226a 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -756,10 +756,20 @@ private void AfterApplicationSettingsJobs() TaskManager.RecentManager.MaxCount = Program.Settings.RecentTasksMaxCount; #if RELEASE + ConfigureAutoUpdate(); +#else + if (UpdateChecker.ForceUpdate) + { + ConfigureAutoUpdate(); + } +#endif + } + + private void ConfigureAutoUpdate() + { Program.UpdateManager.AutoUpdateEnabled = Program.Settings.AutoCheckUpdate && !Program.PortableApps; Program.UpdateManager.CheckPreReleaseUpdates = Program.Settings.CheckPreReleaseUpdates; Program.UpdateManager.ConfigureAutoUpdate(); -#endif } private void AfterTaskSettingsJobs()