From: Sven Strickroth Date: Thu, 31 Jan 2013 16:06:25 +0000 (+0100) Subject: Fixed typo introduced in last commit X-Git-Tag: REL_1.8.2.0_EXTERNAL~242 X-Git-Url: https://repo.or.cz/w/TortoiseGit.git/commitdiff_plain/9bfdfb26cf89f725d2e76bfd1ef9040405929ad4 Fixed typo introduced in last commit Win32 build was broken. Signed-off-by: Sven Strickroth --- diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 0acdb5eae..771f31bd4 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -1699,7 +1699,7 @@ BOOL CGit::CheckMsysGitDir() str=msysdir; if(str.IsEmpty() || !FileExists(str + _T("\\git.exe"))) { - CRegString msyslocalinstalldir = CRegString(REG_MSYSGIT_INSTALL32, _T(""), FALSE, HKEY_CURRENT_USER); + CRegString msyslocalinstalldir = CRegString(REG_MSYSGIT_INSTALL_LOCAL, _T(""), FALSE, HKEY_CURRENT_USER); str = msyslocalinstalldir; str.TrimRight(_T("\\")); if (str.IsEmpty()) diff --git a/src/Git/GitConfig.h b/src/Git/GitConfig.h index 150272335..0667abe73 100644 --- a/src/Git/GitConfig.h +++ b/src/Git/GitConfig.h @@ -31,7 +31,8 @@ public: #ifndef WIN64 #define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation") +#define REG_MSYSGIT_INSTALL_LOCAL REG_MSYSGIT_INSTALL #else -#define REG_MSYSGIT_INSTALL32 _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation") +#define REG_MSYSGIT_INSTALL_LOCAL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation") #define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation") -#endif \ No newline at end of file +#endif