From 5f3d475f4cc0f26524fc9b6eef98bbaa3eaf95cc Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Sat, 26 Sep 2020 15:42:13 -0700 Subject: [PATCH] CDImageMemory: Fix SBI loading --- src/common/cd_image_memory.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/common/cd_image_memory.cpp b/src/common/cd_image_memory.cpp index 54a85a692..c3e38cb0b 100644 --- a/src/common/cd_image_memory.cpp +++ b/src/common/cd_image_memory.cpp @@ -110,20 +110,7 @@ bool CDImageMemory::CopyImage(CDImage* image, ProgressCallback* progress) m_filename = image->GetFileName(); m_lba_count = image->GetLBACount(); - if (!image->Seek(0)) - { - progress->ModalError("Failed to seek to start of image for subq read"); - return false; - } - - progress->SetStatusText("Looking for invalid subchannel data..."); - - CDImage::SubChannelQ subq; - for (LBA lba = 0; lba < m_lba_count; lba++) - { - if (ReadSubChannelQ(&subq) && !subq.IsCRCValid()) - m_sbi.AddReplacementSubChannelQ(lba, subq); - } + m_sbi.LoadSBI(FileSystem::ReplaceExtension(m_filename, "sbi").c_str()); return Seek(1, Position{0, 0, 0}); }