WIP

WinMerge · Jan 20, 2025 · f8aa6e4 · f8aa6e4
1 parent b527722
commit f8aa6e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
@@ -1097,7 +1097,13 @@ void CopyDiffSideAndProperties(CDiffContext& ctxt, DIFFITEM& di, int src, int ds
 		di.diffFileInfo[dst].flags = di.diffFileInfo[src].flags;
 	}
 	if (di.HasChildren())
-		UpdateStatusFromDisk(ctxt, di, dst);
+	{
+		for (DIFFITEM* pdic = di.GetFirstChild(); pdic; pdic = pdic->GetFwdSiblingLink())
+		{
+			CopyDiffSideAndProperties(ctxt, *pdic, src, dst);
+			UpdateStatusFromDisk(ctxt, di, dst);
+		}
+	}
 }
 
 /**

diff --git a/Src/DirActions.h b/Src/DirActions.h
@@ -371,7 +371,7 @@ struct DirActions
 		{
 			if (IsItemIdenticalOrSkipped(*pdi))
 				return true;
-			pdi->GetFwdSiblingLink();
+			pdi = pdi->GetFwdSiblingLink();
 		}
 		return false;
 	}