From b5237e885df72f6c37532fc8af9573966e7b07e5 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 6 Jan 2015 21:30:40 +0000
Subject: Loader: Keep a reference to the file and pass it to the correct
 AppLoader, instead of loading it multiple times.

---
 src/core/loader/3dsx.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/core/loader/3dsx.cpp')

diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index 54ee992f..873ee8b2 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -199,28 +199,15 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr)
     return ERROR_NONE;
 }
 
-/// AppLoader_DSX constructor
-AppLoader_THREEDSX::AppLoader_THREEDSX(const std::string& filename) : filename(filename) {
-}
-
-/// AppLoader_DSX destructor
-AppLoader_THREEDSX::~AppLoader_THREEDSX() {
-}
-
 ResultStatus AppLoader_THREEDSX::Load() {
-    LOG_INFO(Loader, "Loading 3DSX file %s...", filename.c_str());
-
     if (is_loaded)
         return ResultStatus::ErrorAlreadyLoaded;
 
-    FileUtil::IOFile file(filename, "rb");
-
-    if (file.IsOpen()) {
-        Load3DSXFile(file, 0x00100000);
-        Kernel::LoadExec(0x00100000);
-    } else {
+    if (!file->IsOpen())
         return ResultStatus::Error;
-    }
+
+    Load3DSXFile(*file, 0x00100000);
+    Kernel::LoadExec(0x00100000);
 
     is_loaded = true;
     return ResultStatus::Success;
-- 
cgit v1.2.3