From 55d8c4b3330763fe9593e102f73961aa5fec2e79 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 28 Jan 2013 23:24:17 +0100 Subject: [PATCH] Fixed issue #1611: Changing Search criteria with empty search field refreshes log content Signed-off-by: Sven Strickroth --- src/Changelog.txt | 3 +++ src/TortoiseProc/LogDlg.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 44250cdff..1d25da951 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -5,6 +5,9 @@ Released: unreleased * Log dialog can revert selected files to parent revision * Fixed issue #1500: Support git merge --log option +== Bug Fix == + * Fixed issue #1611: Changing Search criteria with empty search field refreshes log content + = Release 1.8.0.0 = Released: 2013-01-27 diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index e9a62a562..fdb2e7822 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -1388,7 +1388,9 @@ LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam) m_LogList.m_SelectedFilters ^= selection; SetFilterCueText(); } - SetTimer(LOGFILTER_TIMER, 1000, NULL); + // Reload only if a search text is entered + if (!m_LogList.m_sFilterText.IsEmpty()) + SetTimer(LOGFILTER_TIMER, 1000, NULL); } } return 0L; -- 2.11.4.GIT