Fix crash when opening directories before completing folder compare

--HG--
branch : stable

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 9e5fca7..4641d56 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -180,6 +180,13 @@ void CDirDoc::Serialize(CArchive& ar)
  */
 void CDirDoc::InitCompare(const PathContext & paths, bool bRecursive, CTempPathContext *pTempPathContext)
 {
+       // Abort previous comparing
+       while (m_diffThread.GetThreadState() == CDiffThread::THREAD_COMPARING)
+       {
+               m_diffThread.Abort();
+               Sleep(50);
+       }
+
        m_pDirView->DeleteAllDisplayItems();
        // Anything that can go wrong here will yield an exception.
        // Default implementation of operator new() never returns NULL.

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 3c41dc4..43edf2b 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -2902,7 +2902,8 @@ LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam)
        if (wParam == CDiffThread::EVENT_COMPARE_COMPLETED)
        {
                // Close and destroy the dialog after compare
-               GetParentFrame()->ShowControlBar(m_pCmpProgressBar.get(), FALSE, FALSE);
+               if (m_pCmpProgressBar)
+                       GetParentFrame()->ShowControlBar(m_pCmpProgressBar.get(), FALSE, FALSE);
                m_pCmpProgressBar.reset();
 
                pDoc->CompareReady();