Add PreviewMarkdown plugin (#1641) (2)

WinMerge · Jan 9, 2023 · f87736e · f87736e
1 parent 20b25ca
commit f87736e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -772,14 +772,16 @@ bool CMainFrame::ShowAutoMergeDoc(UINT nID, CDirDoc * pDirDoc,
 		return false;
 
 	String unpackedFileExtension;
-	if (infoUnpacker && GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+	if ((infoUnpacker || FileTransform::AutoUnpacking) && GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
 	{
 		std::vector<String> filepaths(nFiles);
 		std::transform(ifileloc, ifileloc + nFiles, filepaths.begin(),
 			[](auto& file) { return file.filepath; });
 		String filteredFilenames = strutils::join(filepaths.begin(), filepaths.end(), _T("|"));
 		int preferredWindowType = -1;
-		unpackedFileExtension = infoUnpacker->GetUnpackedFileExtension(filteredFilenames, preferredWindowType);
+		PackingInfo infoUnpacker2;
+		unpackedFileExtension = (infoUnpacker ? infoUnpacker : &infoUnpacker2)
+			->GetUnpackedFileExtension(filteredFilenames, preferredWindowType);
 		if (static_cast<int>(nID) <= 0 && preferredWindowType >= 0)
 			nID = ID_MERGE_COMPARE_TEXT + preferredWindowType;
 	}