From 86877a2a723be2f9ba1f4c74ed77c06824f74e39 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sat, 17 Nov 2012 22:54:39 +0800
Subject: [PATCH] Do not fetch after adding remote when settings dialog
 launches with remote as default page

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseProc/Settings/SettingGitRemote.cpp | 3 ++-
 src/TortoiseProc/Settings/SettingGitRemote.h   | 2 ++
 src/TortoiseProc/Settings/Settings.cpp         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp
index 4e00aa402..7d18666c7 100644
--- a/src/TortoiseProc/Settings/SettingGitRemote.cpp
+++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp
@@ -38,6 +38,7 @@ CSettingGitRemote::CSettingGitRemote(CString cmdPath)
 	, m_strUrl(_T(""))
 	, m_strPuttyKeyfile(_T(""))
 	, m_cmdPath(cmdPath)
+	, m_bNoFetch(false)
 {
 
 	m_ChangedMask = 0;
@@ -270,7 +271,7 @@ BOOL CSettingGitRemote::OnApply()
 
 		this->m_ctrlRemoteList.AddString(m_strRemote);
 		GetDlgItem(IDC_BUTTON_ADD)->EnableWindow(TRUE);
-		if (CMessageBox::Show(NULL, IDS_SETTINGS_FETCH_ADDEDREMOTE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO) == IDYES)
+		if (!m_bNoFetch && CMessageBox::Show(NULL, IDS_SETTINGS_FETCH_ADDEDREMOTE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO) == IDYES)
 			CCommonAppUtils::RunTortoiseProc(_T("/command:fetch /path:\"") + g_Git.m_CurrentDir + _T("\" /remote:\"") + m_strRemote + _T("\""));
 	}
 	if(m_ChangedMask & REMOTE_URL)
diff --git a/src/TortoiseProc/Settings/SettingGitRemote.h b/src/TortoiseProc/Settings/SettingGitRemote.h
index 810f6960c..ad0803cee 100644
--- a/src/TortoiseProc/Settings/SettingGitRemote.h
+++ b/src/TortoiseProc/Settings/SettingGitRemote.h
@@ -41,6 +41,8 @@ public:
 // Dialog Data
 	enum { IDD = IDD_SETTINREMOTE };
 
+	bool		m_bNoFetch;
+
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 
diff --git a/src/TortoiseProc/Settings/Settings.cpp b/src/TortoiseProc/Settings/Settings.cpp
index 0461743ed..51f1ecc79 100644
--- a/src/TortoiseProc/Settings/Settings.cpp
+++ b/src/TortoiseProc/Settings/Settings.cpp
@@ -277,6 +277,7 @@ BOOL CSettings::OnInitDialog()
 	if (this->m_DefaultPage == _T("gitremote"))
 	{
 		this->SetActivePage(this->m_pGitRemote);
+		this->m_pGitRemote->m_bNoFetch = true;
 	}
 	else if (this->m_DefaultPage == _T("gitconfig"))
 	{
-- 
2.11.4.GIT