From 53c78e2644ca04a464ec9203b82cd08531059f69 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Fri, 15 Feb 2013 22:10:23 +0800 Subject: [PATCH] Fix tagopt not saved if clicking OK/Apply directly instead of "Add New/Save" Signed-off-by: Sup Yut Sum --- src/TortoiseProc/Settings/SettingGitRemote.cpp | 9 ++++++--- src/TortoiseProc/Settings/SettingGitRemote.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index 8919a2fc7..d3345dab1 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -66,7 +66,7 @@ BEGIN_MESSAGE_MAP(CSettingGitRemote, CPropertyPage) ON_EN_CHANGE(IDC_EDIT_REMOTE, &CSettingGitRemote::OnEnChangeEditRemote) ON_EN_CHANGE(IDC_EDIT_URL, &CSettingGitRemote::OnEnChangeEditUrl) ON_EN_CHANGE(IDC_EDIT_PUTTY_KEY, &CSettingGitRemote::OnEnChangeEditPuttyKey) - ON_EN_CHANGE(IDC_COMBO_TAGOPT, &CSettingGitRemote::OnEnChangeComboTagOpt) + ON_CBN_SELCHANGE(IDC_COMBO_TAGOPT, &CSettingGitRemote::OnCbnSelchangeComboTagOpt) ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CSettingGitRemote::OnBnClickedButtonRemove) END_MESSAGE_MAP() @@ -248,12 +248,15 @@ void CSettingGitRemote::OnEnChangeEditPuttyKey() this->SetModified(0); } -void CSettingGitRemote::OnEnChangeComboTagOpt() +void CSettingGitRemote::OnCbnSelchangeComboTagOpt() { m_ChangedMask |= REMOTE_TAGOPT; this->UpdateData(); - this->SetModified(); + if (this->m_ctrlTagOpt.GetCurSel() > 0) + this->SetModified(); + else + this->SetModified(0); } void CSettingGitRemote::Save(CString key,CString value) diff --git a/src/TortoiseProc/Settings/SettingGitRemote.h b/src/TortoiseProc/Settings/SettingGitRemote.h index 2b7275ea4..8156e9d60 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.h +++ b/src/TortoiseProc/Settings/SettingGitRemote.h @@ -55,7 +55,7 @@ protected: afx_msg void OnEnChangeEditRemote(); afx_msg void OnEnChangeEditUrl(); afx_msg void OnEnChangeEditPuttyKey(); - afx_msg void OnEnChangeComboTagOpt(); + afx_msg void OnCbnSelchangeComboTagOpt(); afx_msg void OnBnClickedButtonRemove(); BOOL OnInitDialog(); -- 2.11.4.GIT