From: Kimmo Varis <kimmov@gmail.com>
Date: Wed, 22 Jun 2005 16:57:46 +0000 (+0000)
Subject: PATCH: [ 1225090 ] Fix bug that additional item gets selected in dircompare
X-Git-Tag: 2.16.5~5868
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23313393eba0c7905ae21686a62f951a97d37f8d;p=winmerge-jp%2Fwinmerge-jp.git

PATCH: [ 1225090 ] Fix bug that additional item gets selected in dircompare
---

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index e28aa884d..2257844d9 100644
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -686,7 +686,10 @@ void CDirView::PerformActionList(ActionList & actionList)
 	{
 		gLog.Write(_T("Fileoperation succeeded, %d item processed."), nItemCount);
 		UpdateCopiedItems(actionList);
-		UpdateDeletedItems(actionList);
+
+		// If there were deleted items, remove them from view
+		if (!actionList.deletedItems.IsEmpty())
+			UpdateDeletedItems(actionList);
 	}
 	else if (!bOpStarted)
 	{
diff --git a/Src/readme.txt b/Src/readme.txt
index 7a5a839b9..6b6effca0 100644
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-06-22 Kimmo
+ PATCH: [ 1225090 ] Fix bug that additional item gets selected in dircompare
+  Src: DirActions.cpp
+
 2005-06-22 Perry
  Cosmetic: Fix grammar in comment (directory -> directories)
   Src: FileFilterHelper.cpp