diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs index 78aa9278..498c1865 100644 --- a/src/ViewModels/LauncherPage.cs +++ b/src/ViewModels/LauncherPage.cs @@ -59,17 +59,15 @@ namespace SourceGit.ViewModels public void StartPopup(Popup popup) { Popup = popup; - ProcessPopup(true); + ProcessPopup(); } - public async void ProcessPopup(bool autoCheck = false) + public async void ProcessPopup() { if (_popup != null) { if (!_popup.Check()) return; - if (autoCheck && !_popup.AutoCheck()) - return; _popup.InProgress = true; var task = _popup.Sure(); diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs index f8991ff4..7475d829 100644 --- a/src/ViewModels/Popup.cs +++ b/src/ViewModels/Popup.cs @@ -29,7 +29,7 @@ namespace SourceGit.ViewModels } [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")] - public bool Check() + public virtual bool Check() { if (HasErrors) return false; @@ -37,11 +37,6 @@ namespace SourceGit.ViewModels return !HasErrors; } - public virtual bool AutoCheck() - { - return true; - } - public virtual Task Sure() { return null; diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs index 5f37bfaf..697a56fc 100644 --- a/src/ViewModels/Push.cs +++ b/src/ViewModels/Push.cs @@ -152,9 +152,9 @@ namespace SourceGit.ViewModels View = new Views.Push() { DataContext = this }; } - public override bool AutoCheck() + public override bool Check() { - return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head); + return base.Check() && !string.IsNullOrEmpty(_selectedRemoteBranch?.Head); } public override Task Sure()