diff --git a/DiscordChatExporter.Gui/App.axaml.cs b/DiscordChatExporter.Gui/App.axaml.cs index 7823ef56..64e4e422 100644 --- a/DiscordChatExporter.Gui/App.axaml.cs +++ b/DiscordChatExporter.Gui/App.axaml.cs @@ -22,7 +22,7 @@ public class App : Application, IDisposable private readonly ServiceProvider _services; private readonly SettingsService _settingsService; - private readonly IDisposable _eventRoot; + private readonly IDisposable _eventSubscription; private bool _isDisposed; @@ -54,7 +54,7 @@ public class App : Application, IDisposable _settingsService = _services.GetRequiredService(); // Re-initialize the theme when the user changes it - _eventRoot = Disposable.Merge( + _eventSubscription = Disposable.Merge( _settingsService.WatchProperty( o => o.Theme, v => @@ -131,7 +131,7 @@ public class App : Application, IDisposable _isDisposed = true; - _eventRoot.Dispose(); + _eventSubscription.Dispose(); _services.Dispose(); } } diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.cs index 9914e8e2..92734b8b 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.cs @@ -10,11 +10,11 @@ namespace DiscordChatExporter.Gui.Localization; public partial class LocalizationManager : ObservableObject, IDisposable { - private readonly IDisposable _eventRoot; + private readonly IDisposable _eventSubscription; public LocalizationManager(SettingsService settingsService) { - _eventRoot = Disposable.Merge( + _eventSubscription = Disposable.Merge( settingsService.WatchProperty(o => o.Language, v => Language = v, true), this.WatchProperty( o => o.Language, @@ -65,7 +65,7 @@ public partial class LocalizationManager : ObservableObject, IDisposable return $"Missing localization for '{key}'"; } - public void Dispose() => _eventRoot.Dispose(); + public void Dispose() => _eventSubscription.Dispose(); } public partial class LocalizationManager diff --git a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs index f277a8c6..365ef709 100644 --- a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs @@ -29,7 +29,7 @@ public partial class DashboardViewModel : ViewModelBase private readonly DialogManager _dialogManager; private readonly SettingsService _settingsService; - private readonly IDisposable _eventRoot; + private readonly IDisposable _eventSubscription; private readonly AutoResetProgressMuxer _progressMuxer; private DiscordClient? _discord; @@ -50,7 +50,7 @@ public partial class DashboardViewModel : ViewModelBase _progressMuxer = Progress.CreateMuxer().WithAutoReset(); - _eventRoot = Disposable.Merge( + _eventSubscription = Disposable.Merge( Progress.WatchProperty( o => o.Current, _ => OnPropertyChanged(nameof(IsProgressIndeterminate)) @@ -329,7 +329,7 @@ public partial class DashboardViewModel : ViewModelBase { if (disposing) { - _eventRoot.Dispose(); + _eventSubscription.Dispose(); } base.Dispose(disposing); diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs index 413f511b..4fe63ee7 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs @@ -15,7 +15,7 @@ public class SettingsViewModel : DialogViewModelBase { private readonly SettingsService _settingsService; - private readonly IDisposable _eventRoot; + private readonly IDisposable _eventSubscription; public SettingsViewModel( SettingsService settingsService, @@ -25,7 +25,9 @@ public class SettingsViewModel : DialogViewModelBase _settingsService = settingsService; LocalizationManager = localizationManager; - _eventRoot = Disposable.Merge(_settingsService.WatchAllProperties(OnAllPropertiesChanged)); + _eventSubscription = Disposable.Merge( + _settingsService.WatchAllProperties(OnAllPropertiesChanged) + ); } public LocalizationManager LocalizationManager { get; } @@ -140,7 +142,7 @@ public class SettingsViewModel : DialogViewModelBase { if (disposing) { - _eventRoot.Dispose(); + _eventSubscription.Dispose(); } base.Dispose(disposing);