OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4da2a17
)
Fix issue #1588: File Duplication Bug In Outputted Zips (2)
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 29 Nov 2022 14:41:49 +0000
(23:41 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 29 Nov 2022 14:41:49 +0000
(23:41 +0900)
Src/DirView.cpp
patch
|
blob
|
history
diff --git
a/Src/DirView.cpp
b/Src/DirView.cpp
index
8db97ef
..
3278ae2
100644
(file)
--- a/
Src/DirView.cpp
+++ b/
Src/DirView.cpp
@@
-555,7
+555,7
@@
void CDirView::RedisplayChildren(DIFFITEM *diffpos, int level, UINT &index, int
}
else
{
- if (!ctxt.m_bRecursive || !di.diffcode.isDirectory() ||
!di.diffcode.existAll(
))
+ if (!ctxt.m_bRecursive || !di.diffcode.isDirectory() ||
(!di.diffcode.existAll() && !di.HasChildren()
))
{
AddNewItem(index, curdiffpos, I_IMAGECALLBACK, 0);
index++;