From 54dc2a9c73d08d08d39c50ef92437bb0a3b14460 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Thu, 19 Feb 2009 22:53:18 +0800
Subject: [PATCH] RebaseDlg: Hook Cancel to ask user if abort rebase

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TortoiseProc/RebaseDlg.cpp | 8 ++++++--
 src/TortoiseProc/RebaseDlg.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index f67c46a6f..cab8be1c8 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1075,7 +1075,10 @@ LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
 	}	
 	return 0;
 }
-
+void CRebaseDlg::OnCancel()
+{
+	OnBnClickedAbort();
+}
 void CRebaseDlg::OnBnClickedAbort()
 {
 	CString cmd,out;
@@ -1099,5 +1102,6 @@ void CRebaseDlg::OnBnClickedAbort()
 		AddLogString(out);
 		return ;
 	}
-	this->OnCancel();
+	
+	__super::OnCancel();
 }
diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h
index 5d5d2ec54..fbd6b6f54 100644
--- a/src/TortoiseProc/RebaseDlg.h
+++ b/src/TortoiseProc/RebaseDlg.h
@@ -58,6 +58,7 @@ protected:
 	void LoadBranchInfo();
 	void FetchLogList();
 	void SetAllRebaseAction(int action);
+	void OnCancel();
 
 	CRect				m_DlgOrigRect;
 	CRect				m_CommitListOrigRect;
-- 
2.11.4.GIT