Merge r8129

diff --cc Src/OpenView.cpp
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Src/PropGeneral.cpp
index 5e6f18a,8641dec..c92beaa
--- 1/Src/PropGeneral.cpp
--- 2/Src/PropGeneral.cpp
+++ b/Src/PropGeneral.cpp
@@@ -46,17 -45,18 +46,18 @@@ static char THIS_FILE[] = __FILE__
   */
  PropGeneral::PropGeneral(COptionsMgr *optionsMgr) 
  : OptionsPanel(optionsMgr, PropGeneral::IDD)
 -, m_bScroll(FALSE)
 -, m_bDisableSplash(FALSE)
 -, m_bSingleInstance(FALSE)
 -, m_bVerifyPaths(FALSE)
 +, m_bScroll(false)
 +, m_bDisableSplash(false)
 +, m_bSingleInstance(false)
 +, m_bVerifyPaths(false)
  , m_bCloseWindowWithEsc(TRUE)
 -, m_bAskMultiWindowClose(FALSE)
 -, m_bMultipleFileCmp(FALSE)
 -, m_bMultipleDirCmp(FALSE)
 +, m_bAskMultiWindowClose(false)
 +, m_bMultipleFileCmp(false)
 +, m_bMultipleDirCmp(false)
  , m_nAutoCompleteSource(0)
 -, m_bPreserveFiletime(FALSE)
 -, m_bShowSelectFolderOnStartup(FALSE)
 -, m_bCloseWithOK(TRUE)
 +, m_bPreserveFiletime(false)
 +, m_bShowSelectFolderOnStartup(false)
++, m_bCloseWithOK(true)
  {
  }
  

diff --cc Src/PropGeneral.h
index ee5b568,58439ea..d86eb9f
--- 1/Src/PropGeneral.h
--- 2/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@@ -30,17 -30,18 +30,18 @@@ public
  // Dialog Data
        //{{AFX_DATA(PropGeneral)
        enum { IDD = IDD_PROPPAGE_GENERAL };
 -      BOOL  m_bScroll;
 -      BOOL  m_bDisableSplash;
 -      BOOL  m_bSingleInstance;
 -      BOOL  m_bVerifyPaths;
 -      BOOL  m_bCloseWindowWithEsc;
 -      BOOL  m_bAskMultiWindowClose;
 -      BOOL    m_bMultipleFileCmp;
 -      BOOL    m_bMultipleDirCmp;
 -      int             m_nAutoCompleteSource;
 -      BOOL    m_bPreserveFiletime;
 -      BOOL    m_bShowSelectFolderOnStartup;
 -      BOOL    m_bCloseWithOK;
 +      bool  m_bScroll;
 +      bool  m_bDisableSplash;
 +      bool  m_bSingleInstance;
 +      bool  m_bVerifyPaths;
 +      bool  m_bCloseWindowWithEsc;
 +      bool  m_bAskMultiWindowClose;
 +      bool  m_bMultipleFileCmp;
 +      bool  m_bMultipleDirCmp;
 +      int   m_nAutoCompleteSource;
 +      bool  m_bPreserveFiletime;
 +      bool  m_bShowSelectFolderOnStartup;
++      bool  m_bCloseWithOK;
        //}}AFX_DATA