diff options
| author | hizzlekizzle | 2019-03-10 15:56:16 -0500 |
|---|---|---|
| committer | GitHub | 2019-03-10 15:56:16 -0500 |
| commit | e21479a6d304e6c3eed69e2b6385ed674500e8d4 (patch) | |
| tree | f823e88a2ff072eb9e910b7d4ecd93808f178b5d /libpcsxcore/sio.c | |
| parent | 4f8453cb9d67aa7aac5fc1395faa21f07cb2fdc9 (diff) | |
| parent | bc1fc5f30082236c61800444c9b945e8e2095b29 (diff) | |
| download | pcsx_rearmed-e21479a6d304e6c3eed69e2b6385ed674500e8d4.tar.gz pcsx_rearmed-e21479a6d304e6c3eed69e2b6385ed674500e8d4.tar.bz2 pcsx_rearmed-e21479a6d304e6c3eed69e2b6385ed674500e8d4.zip | |
Merge pull request #240 from retro-wertz/core_options
PSX clock and BIOS core options, memcard2 fix etc
Diffstat (limited to 'libpcsxcore/sio.c')
| -rw-r--r-- | libpcsxcore/sio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c index d251fa7..c2390bf 100644 --- a/libpcsxcore/sio.c +++ b/libpcsxcore/sio.c @@ -423,6 +423,12 @@ void LoadMcd(int mcd, char *str) { } McdDisable[mcd - 1] = 0; +#ifdef HAVE_LIBRETRO + // memcard1 is handled by libretro + if (mcd == 1) + return; +#endif + if (str == NULL || strcmp(str, "none") == 0) { McdDisable[mcd - 1] = 1; return; |