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:
dc61584
)
BUG: [ 1239605 ] Cannot open diff due to 7zip error
author
Jochen Tucht
<jtuc@users.sourceforge.net>
Sun, 17 Jul 2005 15:56:37 +0000
(15:56 +0000)
committer
Jochen Tucht
<jtuc@users.sourceforge.net>
Sun, 17 Jul 2005 15:56:37 +0000
(15:56 +0000)
Src/DirView.cpp
patch
|
blob
|
history
diff --git
a/Src/DirView.cpp
b/Src/DirView.cpp
index
3f8f2ee
..
7d14799
100644
(file)
--- a/
Src/DirView.cpp
+++ b/
Src/DirView.cpp
@@
-874,7
+874,7
@@
void CDirView::OpenSelection(PackingInfo * infoUnpacker /*= NULL*/)
}
else if (di.isSideLeft() || di.isSideRight())
AfxMessageBox(IDS_FILEUNIQUE, MB_ICONINFORMATION);
- else if (ArchiveGuessFormat(paths.GetLeft()) && ArchiveGuessFormat(paths.GetRight()))
+ else if (
HasZipSupport() &&
ArchiveGuessFormat(paths.GetLeft()) && ArchiveGuessFormat(paths.GetRight()))
{
// Open archives, not adding paths to MRU
mf->DoFileOpen(paths.GetLeft(), paths.GetRight(), FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc);