BUG: [ 819793 ] Assert when saving after a Dirdoc session

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index be8c25a..192d579 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -485,7 +485,6 @@ void CDirDoc::MergeDocClosing(CMergeDoc * pMergeDoc)
 // in which case this aborts and returns FALSE
 BOOL CDirDoc::ReusingDirDoc()
 {
-
        // Inform all of our merge docs that we're closing
        for (POSITION pos = m_MergeDocs.GetHeadPosition(); pos; )
        {
@@ -498,6 +497,14 @@ BOOL CDirDoc::ReusingDirDoc()
        ASSERT(m_pDirView);
        m_pDirView->DeleteAllDisplayItems();
 
+       // delete comparison parameters and results
+       if (m_pCtxt != NULL)
+               delete m_pCtxt;
+       m_pCtxt = NULL;
+       if (m_pFilter != NULL)
+               delete m_pFilter;
+       m_pFilter = NULL;
+
        return TRUE;
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 7be3664..879443d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,4 +1,6 @@
 2003-10-08 Laoran
+ BUG: [ 819793 ] Assert when saving after a Dirdoc session
+  WinMerge: DirDoc.cpp
  PATCH: [ 818198 ] Colors for "ignore blank lines"
   WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeDoc.cpp MergeEditView.cpp PropColors.cpp 
    PropColors.h resource.h