From e31a5d6ba27ee06fc32b13f147163f2b84a7bad2 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Tue, 29 Jul 2014 02:36:08 +0200
Subject: [PATCH] GitProgressList: Do not show download progress animation for
 reset

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/GitProgressList.cpp | 12 +++++++++++-
 src/TortoiseProc/GitProgressList.h   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp
index ef4ae7294..af222c329 100644
--- a/src/TortoiseProc/GitProgressList.cpp
+++ b/src/TortoiseProc/GitProgressList.cpp
@@ -1748,6 +1748,7 @@ bool CGitProgressList::CmdReset(CString& sWindowTitle, bool& /*localoperation*/)
 	int resetTypesResource[] = { IDS_RESET_SOFT, IDS_RESET_MIXED, IDS_RESET_HARD };
 	ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_TITLE_RESET)) + _T(" ") + CString(MAKEINTRESOURCE(resetTypesResource[m_resetType])) + _T(" ") + m_revision);
 
+	ShowProgressBar();
 	CAutoRepository repo(g_Git.GetGitRepository());
 	if (!repo)
 	{
@@ -1755,7 +1756,6 @@ bool CGitProgressList::CmdReset(CString& sWindowTitle, bool& /*localoperation*/)
 		return false;
 	}
 
-	CSmartAnimation animate(m_pAnimate);
 	CAutoObject target;
 	if (git_revparse_single(target.GetPointer(), repo, CUnicodeUtils::GetUTF8(m_revision)))
 		goto error;
@@ -1887,3 +1887,13 @@ void CGitProgressList::SetWindowTitle(UINT id, const CString& urlorpath, CString
 	dialogname.LoadString(id);
 	CAppUtils::SetWindowTitle(m_pPostWnd->GetSafeHwnd(), urlorpath, dialogname);
 }
+
+void CGitProgressList::ShowProgressBar()
+{
+	if (m_pProgControl)
+	{
+		m_pProgControl->ShowWindow(SW_SHOW);
+		m_pProgControl->SetPos(0);
+		m_pProgControl->SetRange32(0, 1);
+	}
+}
diff --git a/src/TortoiseProc/GitProgressList.h b/src/TortoiseProc/GitProgressList.h
index 41bf643d7..36c6f096a 100644
--- a/src/TortoiseProc/GitProgressList.h
+++ b/src/TortoiseProc/GitProgressList.h
@@ -293,6 +293,7 @@ private:
 public:
 	CComPtr<ITaskbarList3>	m_pTaskbarList;
 	void Init();
+	void ShowProgressBar();
 
 protected:
 	afx_msg void OnClose();
-- 
2.11.4.GIT