BUG: [ 841428 ] WinMerge executable path is deleted

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 3aa6300..48f0f84 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -952,6 +952,7 @@ void CMainFrame::OnOptions()
        filter.m_bIgnoreRegExp = m_bIgnoreRegExp;
        filter.m_sPattern = m_sPattern;
        regpage.m_strEditorPath = m_sExtEditorPath;
+       regpage.GetContextRegValues();
        
        if (sht.DoModal()==IDOK)
        {

diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h
index 8ec6a2d..630d11e 100644 (file)
--- a/Src/PropRegistry.h
+++ b/Src/PropRegistry.h
@@ -41,6 +41,7 @@ class CPropRegistry : public CPropertyPage
 public:
 
        CPropRegistry();   // standard constructor
+       void GetContextRegValues();
        void SaveMergePath();
 
 // Dialog Data
@@ -62,7 +63,6 @@ public:
 protected:
        bool IsRegisteredForDirectory() const;
        void EnableContextHandler(bool enabling);
-       void GetContextRegValues();
 
        // Generated message map functions
        //{{AFX_MSG(CPropRegistry)

diff --git a/Src/readme.txt b/Src/readme.txt
index 2e6bf72..c8eb762 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,11 +1,15 @@
+2003-11-13 Laoran 
+ BUG: [ 841428 ] WinMerge executable path is deleted
+  WinMerge: MainFrm.cpp PropRegistry.h
+
 2003-11-13 Kimmo
  PATCH: [ 838084 ] Add * to newer file's date field in dir compare
   WinMerge: DirView.cpp DirViewColHandler.cpp
  BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent
   WinMerge: MainFrm.cpp
 
-2003-11-13 Laoran
- modify the assert in GetText/GetTextWithoutEmptys
+2003-11-13 Laoran 
+ modify the assert in GetText/GetTextWithoutEmptys (see patch #837480)
  submitted by Jochen
   WinMerge: GhostTextBuffer.cpp
   editlib: ccrystaltextbuffer.cpp