OSDN Git Service

MergeDoc.cpp: Unpacker plugin did not work if 7-zip was not installed
authorsdottaka <sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 12:20:25 +0000 (21:20 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 12:20:25 +0000 (21:20 +0900)
--HG--
branch : stable

Src/MergeDoc.cpp

index 843ca09..2cb6edb 100644 (file)
@@ -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,