Webpage Compare: Add support for generating report files (#1941) (2)

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index e86d5b3..88e60a2 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1064,18 +1064,20 @@ bool CMainFrame::ShowWebDiffDoc(CDirDoc * pDirDoc, int nFiles, const FileLocatio
                
        bool completed = false, result = false;
        if (!pWebPageMergeFrame->OpenDocs(nFiles, fileloc, GetROFromFlags(nFiles, dwFlags).data(), strDesc, this, 
-               [this, pWebPageMergeFrame, nFiles, dwFlags, sReportFile, &completed, &result]()
-               {
-                       pWebPageMergeFrame->MoveOnLoad(GetActivePaneFromFlags(nFiles, dwFlags));
+               [&completed]() { completed = true; }))
+               return false;
 
-                       if (!sReportFile.empty())
-                               pWebPageMergeFrame->GenerateReport(sReportFile, [&result, &completed](bool res) { result = res; completed = true; });
+       WaitAndDoMessageLoop(completed, 0);
 
-               }))
-               return false;
+       pWebPageMergeFrame->MoveOnLoad(GetActivePaneFromFlags(nFiles, dwFlags));
 
        if (!sReportFile.empty())
-               WaitAndDoMessageLoop(completed, 0);
+       {
+               completed = false;
+               if (pWebPageMergeFrame->GenerateReport(sReportFile, [&result, &completed](bool res) { result = res; completed = true; }))
+                       WaitAndDoMessageLoop(completed, 0);
+       }
+
        return true;
 }