diff --git a/DiscordChatExporter.Gui/Services/UpdateService.cs b/DiscordChatExporter.Gui/Services/UpdateService.cs index 2574f11a..b249bb16 100644 --- a/DiscordChatExporter.Gui/Services/UpdateService.cs +++ b/DiscordChatExporter.Gui/Services/UpdateService.cs @@ -10,7 +10,7 @@ namespace DiscordChatExporter.Gui.Services; public class UpdateService(SettingsService settingsService) : IDisposable { private readonly IUpdateManager? _updateManager = - OperatingSystem.IsWindows() && !StartOptions.Current.IsAutoUpdateDisabled + OperatingSystem.IsWindows() && StartOptions.Current.IsAutoUpdateAllowed ? new UpdateManager( new GithubPackageResolver( "Tyrrrz", diff --git a/DiscordChatExporter.Gui/StartOptions.cs b/DiscordChatExporter.Gui/StartOptions.cs index a44de709..68baf4f8 100644 --- a/DiscordChatExporter.Gui/StartOptions.cs +++ b/DiscordChatExporter.Gui/StartOptions.cs @@ -7,7 +7,7 @@ public partial class StartOptions { public required string SettingsPath { get; init; } - public required bool IsAutoUpdateDisabled { get; init; } + public required bool IsAutoUpdateAllowed { get; init; } } public partial class StartOptions @@ -22,8 +22,9 @@ public partial class StartOptions ? Path.Combine(path, "Settings.dat") : path : Path.Combine(AppContext.BaseDirectory, "Settings.dat"), - IsAutoUpdateDisabled = - Environment.GetEnvironmentVariable("DISCORDCHATEXPORTER_DISABLE_UPDATE") is { } v - && (v == "1" || v.Equals("true", StringComparison.OrdinalIgnoreCase)), + IsAutoUpdateAllowed = + Environment.GetEnvironmentVariable("DISCORDCHATEXPORTER_ALLOW_AUTO_UPDATE") is not + { } v + || !(v == "0" || v.Equals("false", StringComparison.OrdinalIgnoreCase)), }; } diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs index 481d3d4f..143246ca 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs @@ -47,7 +47,7 @@ public class SettingsViewModel : DialogViewModelBase } public bool IsAutoUpdateAvailable { get; } = - OperatingSystem.IsWindows() && !StartOptions.Current.IsAutoUpdateDisabled; + OperatingSystem.IsWindows() && StartOptions.Current.IsAutoUpdateAllowed; public bool IsAutoUpdateEnabled {