ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix blockdump reading, the disc type wasn't being properly detected. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/async-iso@5468 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2012-12-02 00:53:14 +00:00
parent d8a1534bce
commit 6dcc908884
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pcsx2/CDVD/InputIsoFile.cpp
View File

@ -45,8 +45,7 @@ int InputIsoFile::ReadSync(u8* dst, uint lsn)
return -1;
}
m_reader->BeginRead(dst+m_blockofs, lsn, 1);
return m_reader->FinishRead();
return m_reader->ReadSync(dst+m_blockofs, lsn, 1);
}
void InputIsoFile::BeginRead2(uint lsn)
@ -203,7 +202,8 @@ bool InputIsoFile::Open( const wxString& srcfile, bool testOnly )
m_reader = new FlatFileReader();
m_reader->Open(m_filename);
if(BlockdumpFileReader::DetectBlockdump(m_reader))
bool isBlockdump;
if(isBlockdump = BlockdumpFileReader::DetectBlockdump(m_reader))
{
delete m_reader;
@ -216,21 +216,23 @@ bool InputIsoFile::Open( const wxString& srcfile, bool testOnly )
m_reader = bdr;
ReadUnit = 1;
ReadUnit = 1;
}
else
bool detected = Detect();
if(testOnly)
return detected;
if (!detected)
throw Exception::BadStream()
.SetUserMsg(_("Unrecognized ISO image file format"))
.SetDiagMsg(L"ISO mounting failed: PCSX2 is unable to identify the ISO image type.");
if(!isBlockdump)
{
ReadUnit = MaxReadUnit;
bool detected = Detect();
if(testOnly)
return detected;
if (!detected)
throw Exception::BadStream()
.SetUserMsg(_("Unrecognized ISO image file format"))
.SetDiagMsg(L"ISO mounting failed: PCSX2 is unable to identify the ISO image type.");
m_reader->SetBlockSize(m_blocksize);
// Returns the original reader if single-part or a Multipart reader otherwise