Tried git revert --no-commit HEAD~1
This commit is contained in:
parent
4d03364017
commit
1b0a1f131e
|
@ -68,11 +68,7 @@ ImageError_e ImageOpen( const std::string & pszImageFilename,
|
||||||
if (pImageInfo->pImageType && pImageInfo->pImageType->GetType() == eImageHDV)
|
if (pImageInfo->pImageType && pImageInfo->pImageType->GetType() == eImageHDV)
|
||||||
{
|
{
|
||||||
if (bExpectFloppy)
|
if (bExpectFloppy)
|
||||||
{
|
|
||||||
Err = eIMAGE_ERROR_UNSUPPORTED_HDV;
|
Err = eIMAGE_ERROR_UNSUPPORTED_HDV;
|
||||||
ImageClose(*ppImageInfo);
|
|
||||||
*ppImageInfo = NULL;
|
|
||||||
}
|
|
||||||
return Err;
|
return Err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1078,14 +1078,6 @@ LRESULT Win32Frame::WndProc(
|
||||||
ProcessButtonClick(BTN_RUN);
|
ProcessButtonClick(BTN_RUN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (Error == eIMAGE_ERROR_UNSUPPORTED_HDV)
|
|
||||||
{
|
|
||||||
if (HD_CardIsEnabled() && DoHardDiskInsert(HARDDISK_1, filename))
|
|
||||||
{
|
|
||||||
SetForegroundWindow(window);
|
|
||||||
ProcessButtonClick(BTN_RUN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
disk2Card.NotifyInvalidImage(iDrive, filename, Error);
|
disk2Card.NotifyInvalidImage(iDrive, filename, Error);
|
||||||
|
|
Loading…
Reference in New Issue