OSDN Git Service

Fix that <Automatic> is displayed in the status bar when New→Binary or New→Image...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Oct 2022 12:58:51 +0000 (21:58 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Oct 2022 12:58:51 +0000 (21:58 +0900)
Src/HexMergeDoc.cpp
Src/ImgMergeFrm.cpp

index b0efc24..9e9bd81 100644 (file)
@@ -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
index 5d60c55..8f41390 100644 (file)
@@ -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