From dca848df52add84b80570301b04933cd89f0b452 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Jul 2019 06:49:20 +0200 Subject: [PATCH] Revert "Revert "(VFS) Add codepath for MSVC CDROM code"" This reverts commit 651774daf1eff2f555839e45f6cc39b10169a1b5. --- libretro-common/vfs/vfs_implementation.c | 5 +++++ retroarch.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index 3842007a90..7e5868e4e0 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -200,6 +200,11 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i { /* VC2005 and up have a special 64-bit fseek */ #ifdef ATLEAST_VC2005 +#ifdef HAVE_CDROM + if (stream->scheme == VFS_SCHEME_CDROM) + return retro_vfs_file_seek_cdrom(stream, offset, whence); + else +#endif return _fseeki64(stream->fp, offset, whence); #elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310 return fseek(stream->fp, (long)offset, whence); diff --git a/retroarch.c b/retroarch.c index 52f5d91a61..89b7078382 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2178,9 +2178,9 @@ bool core_option_manager_get_visible(core_option_manager_t *opt, size_t idx) { if (!opt) - return NULL; + return false; if (idx >= opt->size) - return NULL; + return false; return opt->opts[idx].visible; }