diff --git a/Utilities/File.cpp b/Utilities/File.cpp index 7302dda0c2e9..7a7f31de3d34 100644 --- a/Utilities/File.cpp +++ b/Utilities/File.cpp @@ -1224,13 +1224,21 @@ bool fs::is_optical_raw_device(const std::string& path) } return false; +#else +#ifdef __APPLE__ + // On Mac OS X optical disks will only ever be mounted under /dev/disk(whatever), similar for raw devices, + // so reject anything not containing the disk string. + if (!path.starts_with("/dev/disk") && !path.starts_with("/dev/rdisk")) + { + return false; + } #else // Skip a useless check if the path cannot point to a device node (device nodes always live in "/dev") if (!path.starts_with("/dev/")) { return false; } - +#endif struct ::stat file_info; if (::stat(path.c_str(), &file_info) != 0) diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 814f8d982842..1faee2804354 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -655,14 +655,6 @@ int run_rpcs3(int argc, char** argv) } #endif -#if defined(__APPLE__) && defined(__x86_64__) - if (const utils::OS_version os = utils::get_OS_version(); - os.version_major == 14 && os.version_minor < 3 && (utils::get_cpu_brand().rfind("VirtualApple", 0) == 0)) - { - report_fatal_error(fmt::format("RPCS3 requires macOS 14.3.0 or later.\nYou're currently using macOS %i.%i.%i.\nPlease update macOS from System Settings.\n\n", os.version_major, os.version_minor, os.version_patch)); - } -#endif - ensure(thread_ctrl::is_main(), "Not main thread"); // Initialize thread pool finalizer (on first use)