From 666b688afcf13407d5cebe9a420b709bb77de631 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 16 Oct 2022 21:58:51 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20that=20=20is=20displayed=20in?= =?UTF-8?q?=20the=20status=20bar=20when=20New=E2=86=92Binary=20or=20New?= =?UTF-8?q?=E2=86=92Image=20menu=20item=20is=20selected=20while=20Plugins?= =?UTF-8?q?=E2=86=92Automatic=20Unpacking=20menu=20item=20is=20selected.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/HexMergeDoc.cpp | 2 ++ Src/ImgMergeFrm.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp index b0efc242182..9e9bd81e40f 100644 --- 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 index 5d60c55357b..8f413902e08 100644 --- 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