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:
c6a9c28
)
MergeDoc.cpp: Unpacker plugin did not work if 7-zip was not installed
author
sdottaka
<sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 12:20:25 +0000
(21:20 +0900)
committer
sdottaka
<sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 12:20:25 +0000
(21:20 +0900)
--HG--
branch : stable
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
843ca09
..
2cb6edb
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-3032,7
+3032,7
@@
bool CMergeDoc::OpenWithUnpackerDialog()
{
infoUnpacker = dlg.GetInfoHandler();
Merge7zFormatMergePluginScope scope(&infoUnpacker);
- if (std::count_if(m_filePaths.begin(), m_filePaths.end(), ArchiveGuessFormat) == m_nBuffers)
+ if (
HasZipSupport() &&
std::count_if(m_filePaths.begin(), m_filePaths.end(), ArchiveGuessFormat) == m_nBuffers)
{
DWORD dwFlags[3] = {FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, FFILEOPEN_NOMRU};
GetMainFrame()->DoFileOpen(&m_filePaths, dwFlags,