PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index a780d60..ebb6da9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -663,6 +663,9 @@ void CMainFrame::OnOptions()
        CString selectedFilter;
        theApp.GetFileFilterNameList(filefilters, selectedFilter);
 
+       // use CDiffwrapper static functions to exchange the options with registry
+       CDiffWrapper::ReadDiffOptions(&diffOptions);
+
        CPropertySheet sht(IDS_OPTIONS_TITLE);
        CPropVss vss;
        CPropGeneral gen;
@@ -738,6 +741,9 @@ void CMainFrame::OnOptions()
                theApp.m_bHiliteSyntax = syn.m_bHiliteSyntax;
                theApp.WriteProfileInt(_T("Settings"), _T("HiliteSyntax"), theApp.m_bHiliteSyntax);
 
+               // use CDiffwrapper static functions to exchange the options with registry
+               CDiffWrapper::WriteDiffOptions(&diffOptions);
+
                RebuildRegExpList();
 
                // make an attempt at rescanning any open diff sessions
@@ -906,7 +912,6 @@ BOOL CMainFrame::DoFileOpen(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*
                                  _T("\tVerSys: %d\r\n")
                                  _T("\tVssPath: %s\r\n")
                                  _T("\tBackups: %d\r\n")
-                                 _T("\tIgnoreWS: %d\r\n")
                                  _T("\tScrollToFirst: %d\r\n")
                                  _T("### End Comparison Parameters #############################\r\n"),
                                  strLeft,

diff --git a/Src/readme.txt b/Src/readme.txt
index d5aac75..d97cc07 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2003-08-30 Kimmo
+ PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
+  Submitted by Laoran.
+   WinMerge: MainFrm.cpp
+
 2003-08-30 Laoran
  PATCH: [ 784109 ] layout with two new horizontal panels
   common new files: sizecbar.cpp sizecbar.h sizecbarg.cpp sizecbarg.h