From bb0636d95f278c3fcf6ce2037939b626c4c55247 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 4 Feb 2011 20:51:59 +0100 Subject: [PATCH] Correctly show retries (do not show a 4th retry when there isn't any) Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/SVNProgressDlg.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 695bf99c3..4b00a5b7f 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -43,6 +43,7 @@ * Fixed issues with the send mail dialog If all three attempts failed, do not show success If all three attempts failed, do not go on sending more patches + Correctly show retries (do not show a 4th retry when there isn't any) * TortoiseGitBlame Fixed issue #448: Disable personalized menu behaviour diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp index 019d9cbea..33a16c20c 100644 --- a/src/TortoiseProc/SVNProgressDlg.cpp +++ b/src/TortoiseProc/SVNProgressDlg.cpp @@ -2755,6 +2755,8 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation* } retry++; + if (retry < 3) + Notify(path,git_wc_notify_sendmail_retry,ret,&err); Sleep(2000); if(m_bCancelled) { @@ -2785,9 +2787,9 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation* { break; } - Notify(m_targetPathList[i],git_wc_notify_sendmail_retry,ret,&patch.m_LastError); - retry++; + if (retry < 3) + Notify(m_targetPathList[i],git_wc_notify_sendmail_retry,ret,&patch.m_LastError); Sleep(2000); if(m_bCancelled) { -- 2.11.4.GIT