Fix that <Automatic> is displayed in the status bar when New→Binary o…

…r New→Image menu item is selected while Plugins→Automatic Unpacking menu item is selected.
WinMerge · Oct 16, 2022 · 666b688 · 666b688
1 parent 88b8633
commit 666b688
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp
@@ -533,6 +533,8 @@ bool CHexMergeDoc::OpenDocs(int nFiles, const FileLocation fileloc[], const bool
 		if (m_nBufferType[nBuffer] == BUFFERTYPE::NORMAL || m_nBufferType[nBuffer] == BUFFERTYPE::NORMAL_NAMED)
 			++nNormalBuffer;
 	}
+	if (std::count(m_nBufferType, m_nBufferType + m_nBuffers, BUFFERTYPE::UNNAMED) == m_nBuffers)
+		m_infoUnpacker.Initialize(false);
 	if (nBuffer == nFiles)
 	{
 		// An extra ResizeWindow() on the left view aligns scroll ranges, and

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
@@ -461,6 +461,7 @@ BOOL CImgMergeFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/,
 	bool bResult;
 	if (std::count(m_nBufferType, m_nBufferType + m_filePaths.GetSize(), BUFFERTYPE::UNNAMED) == m_filePaths.GetSize())
 	{
+		m_infoUnpacker.Initialize(false);
 		bResult = m_pImgMergeWindow->NewImages(m_filePaths.GetSize(), 1, 256, 256);
 	}
 	else