libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2025-02-07 02:06:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LinuzCDVDiso: Second part for fixing Issue 679. Have CDVD plugin return "1" from Open() if the user cancels iso source selector.

Browse Source 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3358 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-07-01 15:09:36 +00:00
parent 483c6878a4
commit 1b587538a2
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/CDVDiso/src/CDVDisop.cpp
View File

@ -155,7 +155,12 @@ EXPORT_C_(s32) CDVDopen(const char* pTitle)
CfgOpenFile();
LoadConf();
if (IsoFile[0] == 0)
{
// user pressed CANCEL
return 1;
}
strcpy(temp, IsoFile);
*IsoFile = 0;
SaveConf();
@ -226,6 +231,7 @@ EXPORT_C_(s32) CDVDopen(const char* pTitle)
EXPORT_C_(void) CDVDclose()
{
if (!iso) return;
strcpy(cdvdCurrentIso, IsoFile);
@ -235,6 +241,8 @@ EXPORT_C_(void) CDVDclose()
EXPORT_C_(s32) CDVDreadSubQ(u32 lsn, cdvdSubQ* subq)
{
if (!iso) return -1;
// fake it
u8 min, sec, frm;
subq->ctrl = 4;
@ -266,6 +274,8 @@ EXPORT_C_(s32) CDVDgetTN(cdvdTN *Buffer)
EXPORT_C_(s32) CDVDgetTD(u8 Track, cdvdTD *Buffer)
{
if (!iso) return -1;
if (Track == 0)
{
Buffer->lsn = iso->blocks;
@ -297,6 +307,8 @@ static bool testForPartitionInfo( const u8 (&tempbuffer)[CD_FRAMESIZE_RAW] )
EXPORT_C_(s32) CDVDgetTOC(void* toc)
{
if (!iso) return -1;
u8 type = CDVDgetDiskType();
u8* tocBuff = (u8*)toc;
@ -471,6 +483,8 @@ EXPORT_C_(s32) CDVDgetTOC(void* toc)
EXPORT_C_(s32) CDVDreadTrack(u32 lsn, int mode)
{
if (!iso) return -1;
int _lsn = lsn;
//__Log("CDVDreadTrack: %x %x\n", lsn, mode);