From 10caef5687c1294604e38798915e57cf2d4bed70 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 8 Jul 2024 08:15:18 +0900
Subject: [PATCH] Fix issue #2374: Folder comparison status not accurately
 reflected in toolbar (2)

---
 Src/DirView.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index eb48897ca74..35b365e77c7 100644
--- 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();
 }
 
 /**