Fix issue #2374: Folder comparison status not accurately reflected in…

… toolbar (2)
WinMerge · Jul 7, 2024 · 10caef5 · 10caef5
1 parent acd563f
commit 10caef5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Src/DirView.cpp b/Src/DirView.cpp
@@ -930,8 +930,6 @@ void CDirView::DoDirAction(DirActions::method_type func, const String& status_me
 		ASSERT(rsltScript == &actionScript);
 		// Now we prompt, and execute actions
 		ConfirmAndPerformActions(actionScript);
-		m_firstDiffItem.reset();
-		m_lastDiffItem.reset();
 	} catch (ContentsChangedException& e) {
 		AfxMessageBox(e.m_msg.c_str(), MB_ICONWARNING);
 	} catch (FileOperationException& e) {
@@ -1024,6 +1022,8 @@ void CDirView::PerformActionList(FileActionScript & actionScript)
 	theApp.RemoveOperation();
 	if (!succeeded && !actionScript.IsCanceled())
 		throw FileOperationException(_T("File operation failed"));
+	m_firstDiffItem.reset();
+	m_lastDiffItem.reset();
 }
 
 /**