Merge pull request #4537 from JosJuice/blob-open-less-files

Open less files when detecting/opening blobs

1 files changed, 7 insertions, 6 deletions

diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp
index 7d1dabe198..3547ef658d 100644
--- a/Source/Core/DiscIO/FileBlob.cpp
+++ b/Source/Core/DiscIO/FileBlob.cpp
@@ -2,22 +2,23 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DiscIO/FileBlob.h"
 #include <memory>
 #include <string>
+#include <utility>
+
+#include "DiscIO/FileBlob.h"
 
 namespace DiscIO
 {
-PlainFileReader::PlainFileReader(std::FILE* file) : m_file(file)
+PlainFileReader::PlainFileReader(File::IOFile file) : m_file(std::move(file))
 {
   m_size = m_file.GetSize();
 }
 
-std::unique_ptr<PlainFileReader> PlainFileReader::Create(const std::string& filename)
+std::unique_ptr<PlainFileReader> PlainFileReader::Create(File::IOFile file)
 {
-  File::IOFile f(filename, "rb");
-  if (f)
-    return std::unique_ptr<PlainFileReader>(new PlainFileReader(f.ReleaseHandle()));
+  if (file)
+    return std::unique_ptr<PlainFileReader>(new PlainFileReader(std::move(file)));
 
   return nullptr;
 }