chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-24 05:34:06 +02:00
Code

Fix DismissedUpdate not being set after toggling updates

Browse Source
This commit is contained in:
chylex 2017-01-27 16:21:36 +01:00
parent 65a837a6e1
commit 9ecef78aed
3 changed files with 11 additions and 4 deletions

2
Core/FormBrowser.cs
View File

@ -313,8 +313,10 @@ public void OpenSettings(){
currentFormSettings = null; currentFormSettings = null;
if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){ if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
updates.Settings.DismissedUpdate = string.Empty;
Config.DismissedUpdate = string.Empty; Config.DismissedUpdate = string.Empty;
Config.Save(); Config.Save();
updates.Check(false); updates.Check(false);
} }

1
Core/Other/Settings/TabSettingsUpdates.cs
View File

@ -36,6 +36,7 @@ private void btnCheckUpdates_Click(object sender, EventArgs e){
else{ else{
btnCheckUpdates.Enabled = false; btnCheckUpdates.Enabled = false;
updates.Settings.DismissedUpdate = string.Empty;
Config.DismissedUpdate = string.Empty; Config.DismissedUpdate = string.Empty;
Config.Save(); Config.Save();
} }

12
Updates/UpdateHandler.cs
View File

@ -15,6 +15,12 @@ private static bool IsSystemSupported{
} }
} }
public UpdaterSettings Settings{
get{
return settings;
}
}
private readonly ChromiumWebBrowser browser; private readonly ChromiumWebBrowser browser;
private readonly FormBrowser form; private readonly FormBrowser form;
private readonly UpdaterSettings settings; private readonly UpdaterSettings settings;
@ -44,11 +50,9 @@ private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
public int Check(bool force){ public int Check(bool force){
if (IsSystemSupported){ if (IsSystemSupported){
if (Program.UserConfig.EnableUpdateCheck || force){ if (Program.UserConfig.EnableUpdateCheck || force){
if (force){ string dismissedUpdate = force || settings.DismissedUpdate == null ? string.Empty : settings.DismissedUpdate;
settings.DismissedUpdate = null;
}
browser.ExecuteScriptAsync("TDUF_runUpdateCheck", ++lastEventId, Program.VersionTag, settings.DismissedUpdate ?? string.Empty, settings.AllowPreReleases); browser.ExecuteScriptAsync("TDUF_runUpdateCheck", ++lastEventId, Program.VersionTag, dismissedUpdate, settings.AllowPreReleases);
return lastEventId; return lastEventId;
} }