From 4e58b3c6fc260485505a978d2ccd03cc284f5111 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 13 Dec 2014 19:23:37 +0100 Subject: [PATCH] Fixed issue #2372: Remote Config Tags Dropdown doesn't enable Apply-Button when switching to Reachable Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/Settings/SettingGitRemote.cpp | 22 ++++------------------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 0645aa1f3..ecca54083 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -4,6 +4,7 @@ Released: unreleased == Bug Fixes == * Fixed issue #2359: Selected files counter not updated after revert * Fixed issue #2362: git.exe get stuck on Win XP + * Fixed issue #2372: Remote Config Tags Dropdown doesn't enable Apply-Button when switching to Reachable = Release 1.8.12.0 = Released: 2014-11-25 diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index 671731ce1..983b77bb9 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -339,8 +339,6 @@ void CSettingGitRemote::OnEnChangeEditRemote() ShowEditBalloon(m_hWnd, IDC_EDIT_REMOTE, IDS_B_T_REMOTE_NAME_COLLIDE, IDS_HINT, TTI_WARNING); if( (!this->m_strRemote.IsEmpty())&&(!this->m_strUrl.IsEmpty()) ) this->SetModified(); - else - this->SetModified(0); } void CSettingGitRemote::OnEnChangeEditUrl() @@ -357,8 +355,6 @@ void CSettingGitRemote::OnEnChangeEditUrl() if( (!this->m_strRemote.IsEmpty())&&(!this->m_strUrl.IsEmpty()) ) this->SetModified(); - else - this->SetModified(0); } void CSettingGitRemote::OnEnChangeEditPushUrl() @@ -367,10 +363,8 @@ void CSettingGitRemote::OnEnChangeEditPushUrl() this->UpdateData(); - if ((!this->m_strRemote.IsEmpty()) && (!this->m_strPushUrl.IsEmpty())) + if (!this->m_strRemote.IsEmpty()) this->SetModified(); - else - this->SetModified(0); } void CSettingGitRemote::OnEnChangeEditPuttyKey() @@ -378,10 +372,8 @@ void CSettingGitRemote::OnEnChangeEditPuttyKey() m_ChangedMask|=REMOTE_PUTTYKEY; this->UpdateData(); - if( (!this->m_strRemote.IsEmpty())&&(!this->m_strUrl.IsEmpty()) ) + if (!this->m_strUrl.IsEmpty()) this->SetModified(); - else - this->SetModified(0); } void CSettingGitRemote::OnCbnSelchangeComboTagOpt() @@ -389,10 +381,7 @@ void CSettingGitRemote::OnCbnSelchangeComboTagOpt() m_ChangedMask |= REMOTE_TAGOPT; this->UpdateData(); - if (this->m_ctrlTagOpt.GetCurSel() > 0) - this->SetModified(); - else - this->SetModified(0); + this->SetModified(); } void CSettingGitRemote::OnBnClickedCheckprune() @@ -400,10 +389,7 @@ void CSettingGitRemote::OnBnClickedCheckprune() m_ChangedMask |= REMOTE_PRUNE; this->UpdateData(); - if (m_bPrune != 2) - this->SetModified(); - else - this->SetModified(0); + this->SetModified(); } void CSettingGitRemote::OnBnClickedCheckpruneall() -- 2.11.4.GIT