Fix ASSERT when opening files for merging - from Laoran

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index f36cee3..707ea80 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -300,7 +300,9 @@ void CChildFrame::ActivateFrame(int nCmdShow)
        // load docking position
        CDockState m_pDockState;
        m_pDockState.LoadState(_T("Settings"));
-       SetDockState(m_pDockState);
+       
+       // This causes ASSERT when opening merge docs
+       // SetDockState(m_pDockState);
 }
 
 BOOL CChildFrame::DestroyWindow() 

diff --git a/Src/readme.txt b/Src/readme.txt
index eaa5349..0303c46 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -6,6 +6,9 @@
   WinMerge: ChildFrm.cpp DirFrame.cpp DirView.h DirView.cpp Merge.rc
    MergeEditView.h MergeEditView.cpp Resource.h
   Languages: resource.h *.rc
+ Fix ASSERT when opening files for merging.
+  Submitted by laoran (PATCH [ 784302 ] comments)
+  WinMerge: ChildFrm.cpp
 
 2003-08-30 Kimmo
  PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry