Fix \n problem at putty key file path

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / AppUtils.cpp

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index c0967f5..7feffa1 100644 (file)
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -621,13 +621,16 @@ bool CAppUtils::LaunchPAgent(CString *keyfile,CString * pRemote)
        if( pRemote == NULL)\r
        {\r
                remote=_T("origin");\r
        if( pRemote == NULL)\r
        {\r
                remote=_T("origin");\r

+       }else\r
+       {\r
+               remote=*pRemote;\r

        }\r
        if(keyfile == NULL)\r
        {\r
                cmd.Format(_T("git.exe config remote.%s.puttykeyfile"),remote);\r
                g_Git.Run(cmd,&key,CP_ACP);\r
                int start=0;\r
        }\r
        if(keyfile == NULL)\r
        {\r
                cmd.Format(_T("git.exe config remote.%s.puttykeyfile"),remote);\r
                g_Git.Run(cmd,&key,CP_ACP);\r
                int start=0;\r

-               key.Tokenize(_T("\n"),start);\r
+               key = key.Tokenize(_T("\n"),start);\r

        }\r
        else\r
                key=*keyfile;\r
        }\r
        else\r
                key=*keyfile;\r