From 5f60c2f05b1c98ef019e6c61ad8b391e501f658b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 19 Sep 2012 21:47:44 +0200 Subject: [PATCH] Fixed issue #1403: Unable to switch to a new branch anymore Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitSwitchDlg.cpp | 6 ++++++ src/TortoiseProc/GitSwitchDlg.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/TortoiseProc/GitSwitchDlg.cpp b/src/TortoiseProc/GitSwitchDlg.cpp index 39c18194b..c373f41b3 100644 --- a/src/TortoiseProc/GitSwitchDlg.cpp +++ b/src/TortoiseProc/GitSwitchDlg.cpp @@ -61,6 +61,7 @@ void CGitSwitchDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CGitSwitchDlg, CHorizontalResizableStandAloneDialog) CHOOSE_VERSION_EVENT + ON_BN_CLICKED(IDC_CHECK_BRANCH, &CGitSwitchDlg::OnBnClickedCheckBranch) ON_BN_CLICKED(IDOK, &CGitSwitchDlg::OnBnClickedOk) ON_CBN_SELCHANGE(IDC_COMBOBOXEX_BRANCH, &CGitSwitchDlg::OnCbnEditchangeComboboxexVersion) ON_CBN_SELCHANGE(IDC_COMBOBOXEX_TAGS, &CGitSwitchDlg::OnCbnEditchangeComboboxexVersion) @@ -242,3 +243,8 @@ void CGitSwitchDlg::OnVersionChanged() { SetDefaultName(TRUE); } +void CGitSwitchDlg::OnBnClickedCheckBranch() +{ + UpdateData(); + GetDlgItem(IDC_EDIT_BRANCH)->EnableWindow(m_bBranch); +} diff --git a/src/TortoiseProc/GitSwitchDlg.h b/src/TortoiseProc/GitSwitchDlg.h index 9e317693e..26120937a 100644 --- a/src/TortoiseProc/GitSwitchDlg.h +++ b/src/TortoiseProc/GitSwitchDlg.h @@ -54,6 +54,7 @@ protected: DECLARE_MESSAGE_MAP() + afx_msg void OnBnClickedCheckBranch(); void SetDefaultName(BOOL isUpdateCreateBranch); virtual void OnVersionChanged(); afx_msg void OnCbnSelchangeComboboxexBranch(); -- 2.11.4.GIT