From 92476b82008c292add3974cce5f199e094b640de Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sat, 21 Aug 2010 13:23:46 +0800 Subject: [PATCH] Fixed issue #527: Fix the dialog after commit for us to be able to continue committing Signed-off-by: Frank Li --- src/TortoiseProc/CommitDlg.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index f02d0e9d2..351cd0724 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -624,14 +624,21 @@ void CCommitDlg::OnOK() progress.m_PreText = out; // show any output already generated in log window progress.m_PostCmdList.Add( IsGitSVN? _T("&DCommit"): _T("&Push")); + progress.m_PostCmdList.Add(_T("&ReCommit")); m_PostCmd = IsGitSVN? GIT_POST_CMD_DCOMMIT:GIT_POST_CMD_PUSH; DWORD userResponse = progress.DoModal(); - if(progress.m_GitStatus) + if(progress.m_GitStatus || userResponse == (IDC_PROGRESS_BUTTON1+1)) { bCloseCommitDlg = false; + if( userResponse == (IDC_PROGRESS_BUTTON1+1 )) + { + this->m_sLogMessage.Empty(); + m_cLogMessage.SetText(m_sLogMessage); + } + this->Refresh(); } else if(userResponse == IDC_PROGRESS_BUTTON1) -- 2.11.4.GIT