From 63fbed8b330712676dac34411501d93aa85da357 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 31 Aug 2003 17:38:42 +0000 Subject: [PATCH] Fix ASSERT when opening files for merging - from Laoran --- Src/ChildFrm.cpp | 4 +++- Src/readme.txt | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp index f36cee357..707ea8041 100644 --- 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 eaa534973..0303c46d3 100644 --- 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 -- 2.11.0