Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,14 @@ private void mainWindow_Load(object? sender, EventArgs e) {
// Load AppSettings (also configures logging; some logging already happened).
// #216: SettingsStore.Load never shows UI; the GUI host (here) owns the failure dialogs
// that used to live inside AppSettings.Deserialize, gated the same way (headless = no UI).
SettingsLoadResult settingsLoad = SettingsStore.Load($@"{Program.ConfigPath}{SettingsStore.SettingsFileName}");
ShowSettingsLoadFailure(settingsLoad, $@"{Program.ConfigPath}{SettingsStore.SettingsFileName}");
string settingsFile = $@"{Program.ConfigPath}{SettingsStore.SettingsFileName}";
Logger.Instance.Log4.Info($"Settings: Loading from {settingsFile}");
SettingsLoadResult settingsLoad = SettingsStore.Load(settingsFile);
ShowSettingsLoadFailure(settingsLoad, settingsFile);
ApplySettings(settingsLoad.Settings);

Logger.Instance.Log4.Info($"Settings: DisableUpdatePopup = {Settings.DisableUpdatePopup}");

// TELEMETRY:
// what: Settings
// why: To understand what settings get changed and which dont
Expand Down Expand Up @@ -378,8 +382,11 @@ private void UpdateService_GotLatestVersion(object? sender, Version? version) {
Logger.Instance.Log4.Info("A newer version is available at");
Logger.Instance.Log4.Info($" {UpdateService.Instance.ReleasePageUri}");

if (!Settings.DisableUpdatePopup)
if (Settings.DisableUpdatePopup) {
Logger.Instance.Log4.Info("Update Popup is disabled (DisableUpdatePopup=true)");
} else {
UpdateDialog.Instance.ShowDialog(this);
}
}
else if (UpdateService.Instance.CompareVersions() > 0) {
Logger.Instance.Log4.Info(
Expand Down
Loading