[ 698346 ] Use full path for directory context menu option

diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
index 7ecbcaa..513d7dc 100644 (file)
--- a/Src/PropRegistry.cpp
+++ b/Src/PropRegistry.cpp
@@ -5,6 +5,7 @@
 #include "resource.h"
 #include "PropRegistry.h"
 #include "RegKey.h"
+#include "coretools.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -91,7 +92,8 @@ void CPropRegistry::EnableContextHandler(bool enabling)
                reg.Close();
                if (reg.Open(HKEY_CLASSES_ROOT, f_context_key_cmd) != ERROR_SUCCESS)
                        return;
-               CString cmd = (CString)AfxGetApp()->m_pszExeName + _T(" \"%1\"");
+               CString exe = GetModulePath() + '\\' + AfxGetApp()->m_pszExeName;
+               CString cmd = exe + _T(" \"%1\"");
                reg.WriteString(_T(""), cmd);
        }
        else

diff --git a/Src/readme.txt b/Src/readme.txt
index bb449dc..e446e06 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,8 @@
  Update Danish language file with new strings in MergeDanish.rc
  Removed duplicate dialog in French language file in MergeFrench.rc
  Added Czech to BuildAll.bat
+ PATCH: [ 698346 ] Use full path for directory context menu option
+  WinMerge: PropRegistry.cpp
 
 2003-03-06 Kimmo
  PATCH: [ 696695 ] DirDoc Redisplay optimisation