Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-02-26 05:29:23 +00:00
Code Issues Projects Releases Wiki Activity

Fixed multi-zip regression (numTracks was getting zeroed). (Fixes #824)

Browse Source
This commit is contained in:
tomcw 2020-08-17 20:24:53 +01:00
parent 039ad8a547
commit bcd8fcc726
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/DiskImage.cpp
View File

@ -81,7 +81,7 @@ ImageError_e ImageOpen( const std::string & pszImageFilename,
if (!bExpectFloppy) if (!bExpectFloppy)
return eIMAGE_ERROR_UNSUPPORTED; return eIMAGE_ERROR_UNSUPPORTED;
pImageInfo->uNumTracks = sg_DiskImageHelper.GetNumTracksInImage(pImageInfo->pImageType); _ASSERT(pImageInfo->uNumTracks);
*pWriteProtected = pImageInfo->bWriteProtected; *pWriteProtected = pImageInfo->bWriteProtected;

1
source/DiskImageHelper.cpp
View File

@ -1891,6 +1891,7 @@ void CImageHelperBase::SetImageInfo(ImageInfo* pImageInfo, FileType_e fileType,
pImageInfo->uOffset = dwOffset; pImageInfo->uOffset = dwOffset;
pImageInfo->pImageType = pImageType; pImageInfo->pImageType = pImageType;
pImageInfo->uImageSize = dwSize; pImageInfo->uImageSize = dwSize;
pImageInfo->uNumTracks = pImageType->m_uNumTracksInImage;// Copy ImageType's m_uNumTracksInImage, which may get trashed by subsequent images in the zip (GH#824)
} }
//------------------------------------- //-------------------------------------