Apply some quick hotfixes (#1931)

1 files changed, 2 insertions, 8 deletions

diff --git a/src/FATStorage.cpp b/src/FATStorage.cpp
index 52011a8..9a1a9ad 100644
--- a/src/FATStorage.cpp
+++ b/src/FATStorage.cpp
@@ -32,14 +32,8 @@ using namespace Platform;
 using std::string;
 
 FATStorage::FATStorage(const std::string& filename, u64 size, bool readonly, const std::optional<string>& sourcedir) :
-    FilePath(filename),
-    FileSize(size),
-    ReadOnly(readonly),
-    SourceDir(sourcedir)
+    FATStorage(FATStorageArgs { filename, size, readonly, sourcedir })
 {
-    Load(filename, size, sourcedir);
-
-    File = Platform::OpenLocalFile(FilePath, FileMode::ReadWriteExisting);
 }
 
 FATStorage::FATStorage(const FATStorageArgs& args) noexcept :
@@ -55,7 +49,7 @@ FATStorage::FATStorage(FATStorageArgs&& args) noexcept :
 {
     Load(FilePath, FileSize, SourceDir);
 
-    File = nullptr;
+    File = Platform::OpenLocalFile(FilePath, FileMode::ReadWriteExisting);
 }
 
 FATStorage::FATStorage(FATStorage&& other) noexcept