From 296938235f2b50c6a9d9a58a2f4697b493839bf8 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 27 Jul 2015 22:52:45 +0200 Subject: [PATCH] LogDlg: Disable default filter if called with a specific range Signed-off-by: Sven Strickroth --- src/TortoiseProc/LogDlg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 382e092d1..13c1d4e44 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -221,9 +221,9 @@ void CLogDlg::SetParams(const CTGitPath& orgPath, const CTGitPath& path, CString SetRange(range); - if (limitScale == CFilterData::SHOW_NO_LIMIT) - m_LogList.m_Filter.m_NumberOfLogsScale = limitScale; - else if (limitScale >= CFilterData::SHOW_LAST_N_COMMITS && limit > 0) + if (limitScale == CFilterData::SHOW_NO_LIMIT || (!range.IsEmpty() && m_LogList.m_Filter.m_NumberOfLogsScale != CFilterData::SHOW_LAST_N_COMMITS)) + m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_NO_LIMIT; + if (limitScale >= CFilterData::SHOW_LAST_N_COMMITS && limit > 0) { // limitation from command line argument, so override the filter. m_LogList.m_Filter.m_NumberOfLogs = limit; -- 2.11.4.GIT