From 516179c5bbcdf9728d99f747a78f687b15308fe9 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Mon, 17 Dec 2012 18:41:41 +0800 Subject: [PATCH] Fix TortoiseGitProc.exe and TortoiseGitMerge.exe cannot show help after exe renaming Signed-off-by: Sup Yut Sum --- src/TortoiseMerge/TortoiseMerge.cpp | 5 +---- src/TortoiseProc/TortoiseProc.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/TortoiseMerge/TortoiseMerge.cpp b/src/TortoiseMerge/TortoiseMerge.cpp index 43edd4065..5d6323598 100644 --- a/src/TortoiseMerge/TortoiseMerge.cpp +++ b/src/TortoiseMerge/TortoiseMerge.cpp @@ -107,10 +107,7 @@ BOOL CTortoiseMergeApp::InitInstance() TCHAR buf[6]; _tcscpy_s(buf, _T("en")); langId = loc; - CString sHelppath; - sHelppath = this->m_pszHelpFilePath; - sHelppath = sHelppath.MakeLower(); - sHelppath.Replace(_T(".chm"), _T("_en.chm")); + CString sHelppath = CPathUtils::GetAppDirectory() + _T("TortoiseMerge_en.chm"); free((void*)m_pszHelpFilePath); m_pszHelpFilePath=_tcsdup(sHelppath); sHelppath = CPathUtils::GetAppParentDirectory() + _T("Languages\\TortoiseMerge_en.chm"); diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 4fa285e0a..71317746e 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -149,12 +149,9 @@ BOOL CTortoiseProcApp::InitInstance() TCHAR buf[6]; _tcscpy_s(buf, _T("en")); langId = loc; - CString sHelppath; - sHelppath = this->m_pszHelpFilePath; - sHelppath = sHelppath.MakeLower(); // MFC uses a help file with the same name as the application by default, // which means we have to change that default to our language specific help files - sHelppath.Replace(_T("tortoiseproc.chm"), _T("TortoiseGit_en.chm")); + CString sHelppath = CPathUtils::GetAppDirectory() + _T("TortoiseGit_en.chm"); free((void*)m_pszHelpFilePath); m_pszHelpFilePath=_tcsdup(sHelppath); sHelppath = CPathUtils::GetAppParentDirectory() + _T("Languages\\TortoiseGit_en.chm"); -- 2.11.4.GIT