RebaseDlg: Hook Cancel to ask user if abort rebase

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index f67c46a..cab8be1 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1075,7 +1075,10 @@ LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
        }       \r
        return 0;\r
 }\r
-\r
+void CRebaseDlg::OnCancel()\r
+{\r
+       OnBnClickedAbort();\r
+}\r
 void CRebaseDlg::OnBnClickedAbort()\r
 {\r
        CString cmd,out;\r
@@ -1099,5 +1102,6 @@ void CRebaseDlg::OnBnClickedAbort()
                AddLogString(out);\r
                return ;\r
        }\r
-       this->OnCancel();\r
+       \r
+       __super::OnCancel();\r
 }\r

diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h
index 5d5d2ec..fbd6b6f 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.h
+++ b/src/TortoiseProc/RebaseDlg.h
@@ -58,6 +58,7 @@ protected:
        void LoadBranchInfo();\r
        void FetchLogList();\r
        void SetAllRebaseAction(int action);\r
+       void OnCancel();\r
 \r
        CRect                           m_DlgOrigRect;\r
        CRect                           m_CommitListOrigRect;\r