From 3143e01a310d5afb978d02cf9b6238ada61210d1 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 20 Jun 2016 08:50:49 +0300 Subject: [PATCH] Assign IsFirstTimeRun and IsUpgrade on setting load --- ShareX.HelpersLib/SettingsBase.cs | 18 ++++-------------- .../UpdateChecker/GitHubUpdateChecker.cs | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ShareX.HelpersLib/SettingsBase.cs b/ShareX.HelpersLib/SettingsBase.cs index 8a1a6f98f..2f089cbf1 100644 --- a/ShareX.HelpersLib/SettingsBase.cs +++ b/ShareX.HelpersLib/SettingsBase.cs @@ -44,22 +44,10 @@ public abstract class SettingsBase where T : SettingsBase, new() public string ApplicationVersion { get; set; } [Browsable(false)] - public bool IsFirstTimeRun - { - get - { - return string.IsNullOrEmpty(ApplicationVersion); - } - } + public bool IsFirstTimeRun { get; private set; } [Browsable(false)] - public bool IsUpgrade - { - get - { - return !IsFirstTimeRun && Helpers.CompareApplicationVersion(ApplicationVersion) < 0; - } - } + public bool IsUpgrade { get; private set; } protected virtual void OnSettingsSaved(string filePath, bool result) { @@ -103,6 +91,8 @@ public static T Load(string filePath) if (setting != null) { setting.FilePath = filePath; + setting.IsFirstTimeRun = string.IsNullOrEmpty(setting.ApplicationVersion); + setting.IsUpgrade = !setting.IsFirstTimeRun && Helpers.CompareApplicationVersion(setting.ApplicationVersion) < 0; } return setting; diff --git a/ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs index d1d1d37eb..5819402ef 100644 --- a/ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs +++ b/ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs @@ -140,7 +140,7 @@ private GitHubRelease GetLatestRelease(bool includePreRelease) return latestRelease; } - public bool UpdateReleaseInfo(GitHubRelease release, bool isPortable, bool isBrowserDownloadURL) + private bool UpdateReleaseInfo(GitHubRelease release, bool isPortable, bool isBrowserDownloadURL) { if (release != null && !string.IsNullOrEmpty(release.tag_name) && release.tag_name.Length > 1 && release.tag_name[0] == 'v') {