Merge pull request #10403 from AdmiralCurtiss/iofile-seek

Minor IOFile cleanup.

1 files changed, 8 insertions, 4 deletions

diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp
index 36c6850abc..28408402b8 100644
--- a/Source/Core/DiscIO/CISOBlob.cpp
+++ b/Source/Core/DiscIO/CISOBlob.cpp
@@ -18,7 +18,7 @@ CISOFileReader::CISOFileReader(File::IOFile file) : m_file(std::move(file))
   m_size = m_file.GetSize();
 
   CISOHeader header;
-  m_file.Seek(0, SEEK_SET);
+  m_file.Seek(0, File::SeekOrigin::Begin);
   m_file.ReadArray(&header, 1);
 
   m_block_size = header.block_size;
@@ -31,8 +31,11 @@ CISOFileReader::CISOFileReader(File::IOFile file) : m_file(std::move(file))
 std::unique_ptr<CISOFileReader> CISOFileReader::Create(File::IOFile file)
 {
   CISOHeader header;
-  if (file.Seek(0, SEEK_SET) && file.ReadArray(&header, 1) && header.magic == CISO_MAGIC)
+  if (file.Seek(0, File::SeekOrigin::Begin) && file.ReadArray(&header, 1) &&
+      header.magic == CISO_MAGIC)
+  {
     return std::unique_ptr<CISOFileReader>(new CISOFileReader(std::move(file)));
+  }
 
   return nullptr;
 }
@@ -63,9 +66,10 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
       // calculate the base address
       u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset;
 
-      if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read)))
+      if (!(m_file.Seek(file_off, File::SeekOrigin::Begin) &&
+            m_file.ReadArray(out_ptr, bytes_to_read)))
       {
-        m_file.Clear();
+        m_file.ClearError();
         return false;
       }
     }