From f1eb598e8a9fb38ae14c269abb98989360f31d20 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 3 Jan 2015 16:26:18 +0100 Subject: [PATCH] Fixed issue #2391: Cannot clear "Load Putty Key" in clone dialog persistently Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/CloneDlg.cpp | 8 +++++--- src/TortoiseProc/CloneDlg.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index b1eb88c5a..f1c653a8d 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -18,6 +18,7 @@ Released: unreleased * Fixed issue #2385: 'Mail' - 'Use configured server' & 'none'... seems can not be localized * Fixed issue #2356: Rebase dialog should also auto-link to issue tracker * Fixed issue #2390: /command:log /outfile not written + * Fixed issue #2391: Cannot clear "Load Putty Key" in clone dialog persistently = Release 1.8.12.0 = Released: 2014-11-25 diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp index 582198e73..681477b17 100644 --- a/src/TortoiseProc/CloneDlg.cpp +++ b/src/TortoiseProc/CloneDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2014 - TortoiseGit +// Copyright (C) 2008-2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -33,8 +33,6 @@ CCloneDlg::CCloneDlg(CWnd* pParent /*=NULL*/) : CHorizontalResizableStandAloneDialog(CCloneDlg::IDD, pParent) , m_Directory(_T("")) { - m_bAutoloadPuttyKeyFile = CAppUtils::IsSSHPutty(); - m_bRecursive = FALSE; m_bBare = FALSE; m_bBranch = FALSE; @@ -54,8 +52,11 @@ CCloneDlg::CCloneDlg(CWnd* pParent /*=NULL*/) m_regBrowseUrl = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\CloneBrowse"),0); m_regCloneDir = CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\CloneDir")); + m_regUseSSHKey = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\CloneUseSSHKey"), TRUE); m_nSVNFrom = 0; + m_bAutoloadPuttyKeyFile = m_regUseSSHKey && CAppUtils::IsSSHPutty(); + m_nDepth = 1; m_bDepth = false; m_bSaving = false; @@ -244,6 +245,7 @@ void CCloneDlg::OnOK() m_URLCombo.SaveHistory(); m_PuttyKeyCombo.SaveHistory(); m_regCloneDir = m_Directory; + m_regUseSSHKey = m_bAutoloadPuttyKeyFile; this->m_PuttyKeyCombo.GetWindowText(m_strPuttyKeyFile); CResizableDialog::OnOK(); diff --git a/src/TortoiseProc/CloneDlg.h b/src/TortoiseProc/CloneDlg.h index 10bbb61ae..d2cbb9411 100644 --- a/src/TortoiseProc/CloneDlg.h +++ b/src/TortoiseProc/CloneDlg.h @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2013 - TortoiseGit +// Copyright (C) 2008-2013,2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -88,6 +88,7 @@ public: protected: CMenuButton m_BrowseUrl; CRegDWORD m_regBrowseUrl; + CRegDWORD m_regUseSSHKey; CRegString m_regCloneDir; bool m_bSaving; -- 2.11.4.GIT