github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 02:12:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: disable CONTINUE button while it is running (#1046)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-03-04 09:29:07 +08:00
parent 35ee4a47db
commit d4bcc60113
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ViewModels/WorkingCopy.cs
View File

@@ -440,6 +440,8 @@ namespace SourceGit.ViewModels
public void ContinueMerge()
{
IsCommitting = true;
if (_inProgressContext != null)
{
_repo.SetWatcherEnabled(false);
@@ -456,17 +458,21 @@ namespace SourceGit.ViewModels
CommitMessage = string.Empty;
_repo.SetWatcherEnabled(true);
IsCommitting = false;
});
});
}
else
{
_repo.MarkWorkingCopyDirtyManually();
IsCommitting = false;
}
}
public void SkipMerge()
{
IsCommitting = true;
if (_inProgressContext != null)
{
_repo.SetWatcherEnabled(false);
@@ -479,17 +485,21 @@ namespace SourceGit.ViewModels
CommitMessage = string.Empty;
_repo.SetWatcherEnabled(true);
IsCommitting = false;
});
});
}
else
{
_repo.MarkWorkingCopyDirtyManually();
IsCommitting = false;
}
}
public void AbortMerge()
{
IsCommitting = true;
if (_inProgressContext != null)
{
_repo.SetWatcherEnabled(false);
@@ -502,12 +512,14 @@ namespace SourceGit.ViewModels
CommitMessage = string.Empty;
_repo.SetWatcherEnabled(true);
IsCommitting = false;
});
});
}
else
{
_repo.MarkWorkingCopyDirtyManually();
IsCommitting = false;
}
}