diff --git a/src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs index f251bbc98..cf05ca4bd 100644 --- a/src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs +++ b/src/ST.Client.Desktop/UI/ViewModels/Base/TabItemViewModel.cs @@ -75,23 +75,14 @@ namespace System.Application.UI.ViewModels await Task.CompletedTask; } + protected bool IsFirstActivation = true; + internal async virtual void Activation() { - await Task.CompletedTask; - } - - internal bool _IsFirstActivation = true; - internal void FirstActivation() - { - if (_IsFirstActivation) + if (IsFirstActivation) { - ActivationOnFirst(); - _IsFirstActivation = false; + IsFirstActivation = false; } - } - - internal async virtual void ActivationOnFirst() - { await Task.CompletedTask; } } diff --git a/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs index c852dfaf8..198f58827 100644 --- a/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs +++ b/src/ST.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs @@ -102,8 +102,6 @@ namespace System.Application.UI.ViewModels this.WhenAnyValue(x => x.SelectedItem) .Subscribe(x => { - if (x._IsFirstActivation) - Task.Run(x.FirstActivation).ForgetAndDispose(); Task.Run(x.Activation).ForgetAndDispose(); }); } diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs index da8ca2879..dda82db64 100644 --- a/src/ST.Client.Desktop/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs +++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs @@ -22,11 +22,16 @@ namespace System.Application.UI.ViewModels get => AppResources.ScriptConfig; protected set { throw new NotImplementedException(); } } - internal override void ActivationOnFirst() + + internal override void Activation() { - if (ProxySettings.IsAutoCheckScriptUpdate) - ProxyService.Current.CheckUpdate(); + base.Activation(); + + if (IsFirstActivation) + if (ProxySettings.IsAutoCheckScriptUpdate) + ProxyService.Current.CheckUpdate(); } + private readonly ReadOnlyObservableCollection _ProxyScripts; public ReadOnlyObservableCollection ProxyScripts => _ProxyScripts;