WIP

sdottaka · sdottaka · commit 4e26a0e3fec0 · 2025-01-21T08:47:34.000+09:00
diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
@@ -1087,7 +1087,7 @@ int GetColImage(const DIFFITEM &di)
 void CopyDiffSideAndProperties(CDiffContext& ctxt, DIFFITEM& di, int src, int dst, int action)
 {
 	if (di.diffcode.exists(src) &&
-		action != FileActionItem::UI_COPY_DIFFITEMS || di.diffcode.isResultDiff())
+		(action != FileActionItem::UI_COPY_DIFFITEMS || di.diffcode.isResultDiff()))
 	{
 		di.diffcode.diffcode |= (DIFFCODE::FIRST << dst);
 		// copy file properties other than ctime 

Original file line number	Diff line number	Diff line change
`@@ -1087,7 +1087,7 @@ int GetColImage(const DIFFITEM &di)`
`1087`	`1087`	`void CopyDiffSideAndProperties(CDiffContext& ctxt, DIFFITEM& di, int src, int dst, int action)`
`1088`	`1088`	`{`
`1089`	`1089`	`if (di.diffcode.exists(src) &&`
`1090`		`- action != FileActionItem::UI_COPY_DIFFITEMS \|\| di.diffcode.isResultDiff())`
	`1090`	`+ (action != FileActionItem::UI_COPY_DIFFITEMS \|\| di.diffcode.isResultDiff()))`
`1091`	`1091`	`{`
`1092`	`1092`	`di.diffcode.diffcode \|= (DIFFCODE::FIRST << dst);`
`1093`	`1093`	`// copy file properties other than ctime`