1 files changed, 12 insertions, 13 deletions

diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp
index ec0bad5b9b..3b2ab36694 100644
--- a/Source/Core/Common/SysConf.cpp
+++ b/Source/Core/Common/SysConf.cpp
@@ -72,7 +72,7 @@ bool SysConf::LoadFromFile(const std::string& filename)
   File::IOFile f(filename, "rb");
   if (f.IsOpen())
   {
-    if (LoadFromFileInternal(f.ReleaseHandle()))
+    if (LoadFromFileInternal(std::move(f)))
     {
       m_Filename = filename;
       m_IsValid = true;
@@ -90,19 +90,18 @@ bool SysConf::LoadFromFile(const std::string& filename)
   return false;
 }
 
-bool SysConf::LoadFromFileInternal(FILE* fh)
+bool SysConf::LoadFromFileInternal(File::IOFile&& file)
 {
-  File::IOFile f(fh);
   // Fill in infos
   SSysConfHeader s_Header;
-  f.ReadArray(s_Header.version, 4);
-  f.ReadArray(&s_Header.numEntries, 1);
+  file.ReadArray(s_Header.version, 4);
+  file.ReadArray(&s_Header.numEntries, 1);
   s_Header.numEntries = Common::swap16(s_Header.numEntries) + 1;
 
   for (u16 index = 0; index < s_Header.numEntries; index++)
   {
     SSysConfEntry tmpEntry;
-    f.ReadArray(&tmpEntry.offset, 1);
+    file.ReadArray(&tmpEntry.offset, 1);
     tmpEntry.offset = Common::swap16(tmpEntry.offset);
     m_Entries.push_back(tmpEntry);
   }
@@ -111,16 +110,16 @@ bool SysConf::LoadFromFileInternal(FILE* fh)
   for (auto i = m_Entries.begin(); i < m_Entries.end() - 1; ++i)
   {
     SSysConfEntry& curEntry = *i;
-    f.Seek(curEntry.offset, SEEK_SET);
+    file.Seek(curEntry.offset, SEEK_SET);
 
     u8 description = 0;
-    f.ReadArray(&description, 1);
+    file.ReadArray(&description, 1);
     // Data type
     curEntry.type = (SysconfType)((description & 0xe0) >> 5);
     // Length of name in bytes - 1
     curEntry.nameLength = (description & 0x1f) + 1;
     // Name
-    f.ReadArray(curEntry.name, curEntry.nameLength);
+    file.ReadArray(curEntry.name, curEntry.nameLength);
     curEntry.name[curEntry.nameLength] = '\0';
     // Get length of data
     curEntry.data = nullptr;
@@ -128,14 +127,14 @@ bool SysConf::LoadFromFileInternal(FILE* fh)
     switch (curEntry.type)
     {
     case Type_BigArray:
-      f.ReadArray(&curEntry.dataLength, 1);
+      file.ReadArray(&curEntry.dataLength, 1);
       curEntry.dataLength = Common::swap16(curEntry.dataLength);
       break;
 
     case Type_SmallArray:
     {
       u8 dlength = 0;
-      f.ReadBytes(&dlength, 1);
+      file.ReadBytes(&dlength, 1);
       curEntry.dataLength = dlength;
       break;
     }
@@ -167,11 +166,11 @@ bool SysConf::LoadFromFileInternal(FILE* fh)
     if (curEntry.dataLength)
     {
       curEntry.data = new u8[curEntry.dataLength];
-      f.ReadArray(curEntry.data, curEntry.dataLength);
+      file.ReadArray(curEntry.data, curEntry.dataLength);
     }
   }
 
-  return f.IsGood();
+  return file.IsGood();
 }
 
 // Returns the size of the item in file