System: Use existing CD media when loading state where possible

2020-07-22 00:02:37 +10:00
parent 0398c6cb4a
commit 93528db388
5 changed files with 19 additions and 11 deletions
--- a/src/core/cdrom_async_reader.cpp
+++ b/src/core/cdrom_async_reader.cpp
@ -43,10 +43,10 @@ void CDROMAsyncReader::SetMedia(std::unique_ptr<CDImage> media)
  m_media = std::move(media);
 }

-void CDROMAsyncReader::RemoveMedia()
+std::unique_ptr<CDImage> CDROMAsyncReader::RemoveMedia()
 {
  WaitForReadToComplete();
-  m_media.reset();
+  return std::move(m_media);
 }

 void CDROMAsyncReader::QueueReadSector(CDImage::LBA lba)