Skip to content

Commit 9a36e65

Browse files
committed
fix: add a new interface CanStartDirectly and move this check to StartPopup (#956)
Signed-off-by: leo <[email protected]>
1 parent 8ed7a99 commit 9a36e65

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/ViewModels/LauncherPage.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ public bool CanCreatePopup()
5959
public void StartPopup(Popup popup)
6060
{
6161
Popup = popup;
62-
ProcessPopup();
62+
63+
if (popup.CanStartDirectly())
64+
ProcessPopup();
6365
}
6466

6567
public async void ProcessPopup()

src/ViewModels/Popup.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ public string ProgressDescription
2929
}
3030

3131
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")]
32-
public virtual bool Check()
32+
public bool Check()
3333
{
3434
if (HasErrors)
3535
return false;
3636
ValidateAllProperties();
3737
return !HasErrors;
3838
}
3939

40+
public virtual bool CanStartDirectly()
41+
{
42+
return true;
43+
}
44+
4045
public virtual Task<bool> Sure()
4146
{
4247
return null;

src/ViewModels/Push.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ public Push(Repository repo, Models.Branch localBranch)
152152
View = new Views.Push() { DataContext = this };
153153
}
154154

155-
public override bool Check()
155+
public override bool CanStartDirectly()
156156
{
157-
return base.Check() && !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
157+
return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
158158
}
159159

160160
public override Task<bool> Sure()

0 commit comments

Comments
 (0)