From 3e83b179349812d4d6565ae628a57b3b2f636393 Mon Sep 17 00:00:00 2001
From: sdottaka <sdottaka@users.sourceforge.net>
Date: Tue, 17 Feb 2015 21:20:25 +0900
Subject: [PATCH] MergeDoc.cpp: Unpacker plugin did not work if 7-zip was not
 installed

--HG--
branch : stable
---
 Src/MergeDoc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 843ca099c..2cb6edb39 100644
--- 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, 
-- 
2.11.0