From 7101b86d2f21392c03dbfebe8a4901538f59872a Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 6 Dec 2022 13:25:28 +1000 Subject: [PATCH] System: Don't unconditionally apply TTY enable patch Fixes Intelligent Qube hang. --- src/core/system.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index dcff96eaa..839cd514b 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1208,10 +1208,13 @@ bool System::BootSystem(SystemBootParameters parameters) // Enable tty by patching bios. const BIOS::ImageInfo* bios_info = BIOS::GetInfoForImage(bios_image.value()); - if (bios_info && bios_info->patch_compatible) - BIOS::PatchBIOSEnableTTY(Bus::g_bios, Bus::BIOS_SIZE); - else - Log_ErrorPrintf("Not patching TTY enable, as BIOS is not patch compatible."); + if (g_settings.bios_patch_tty_enable) + { + if (bios_info && bios_info->patch_compatible) + BIOS::PatchBIOSEnableTTY(Bus::g_bios, Bus::BIOS_SIZE); + else + Log_ErrorPrintf("Not patching TTY enable, as BIOS is not patch compatible."); + } // Load EXE late after BIOS. if (exe_boot && !LoadEXE(parameters.filename.c_str()))