Fix "ESC" = "push" when after commit

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / ProgressDlg.cpp

diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp
index 1cc505e..21cf4dd 100644 (file)
--- a/src/TortoiseProc/ProgressDlg.cpp
+++ b/src/TortoiseProc/ProgressDlg.cpp
@@ -14,6 +14,7 @@ CProgressDlg::CProgressDlg(CWnd* pParent /*=NULL*/)
        : CResizableStandAloneDialog(CProgressDlg::IDD, pParent), m_bShowCommand(true), m_bAutoCloseOnSuccess(false), m_bAbort(false), m_bDone(false)\r
 {\r
        m_pThread = NULL;\r
+       m_bAltAbortPress=false;\r
 }\r
 \r
 CProgressDlg::~CProgressDlg()\r
@@ -37,6 +38,7 @@ void CProgressDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CProgressDlg, CResizableStandAloneDialog)\r
        ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)\r
        ON_BN_CLICKED(IDOK, &CProgressDlg::OnBnClickedOk)\r
+       ON_BN_CLICKED(IDCANCEL,&CProgressDlg::OnBnClickedCancel)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CProgressDlg::OnInitDialog()\r
@@ -261,6 +263,22 @@ void CProgressDlg::OnBnClickedOk()
        OnOK();\r
 }\r
 \r
+void CProgressDlg::OnBnClickedCancel()\r
+{\r
+       if(!this->m_changeAbortButtonOnSuccessTo.IsEmpty())\r
+       {\r
+               CString text;\r
+               GetDlgItem(IDCANCEL)->GetWindowText(text);\r
+               if(m_changeAbortButtonOnSuccessTo == text)\r
+               {\r
+                       m_bAltAbortPress=true;\r
+               }\r
+       \r
+       }\r
+       \r
+       OnCancel();\r
+       \r
+}\r
 void CProgressDlg::OnCancel()\r
 {\r
        if(m_bDone)\r