From 86786738cc91dbea5f9dcdf0e147bd6615e1ca46 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Fri, 23 Sep 2022 22:53:23 +0200
Subject: properly make the DSi NAND instance-unique

---
 src/frontend/qt_sdl/TitleManagerDialog.cpp | 19 +++++++------------
 src/frontend/qt_sdl/TitleManagerDialog.h   |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/frontend/qt_sdl')

diff --git a/src/frontend/qt_sdl/TitleManagerDialog.cpp b/src/frontend/qt_sdl/TitleManagerDialog.cpp
index a4c9cfd..8087ee6 100644
--- a/src/frontend/qt_sdl/TitleManagerDialog.cpp
+++ b/src/frontend/qt_sdl/TitleManagerDialog.cpp
@@ -31,7 +31,7 @@
 #include "ui_TitleImportDialog.h"
 
 
-FILE* TitleManagerDialog::curNAND = nullptr;
+bool TitleManagerDialog::NANDInited = false;
 TitleManagerDialog* TitleManagerDialog::currentDlg = nullptr;
 
 extern std::string EmuDirectory;
@@ -136,6 +136,8 @@ void TitleManagerDialog::createTitleItem(u32 category, u32 titleid)
 
 bool TitleManagerDialog::openNAND()
 {
+    NANDInited = false;
+
     FILE* bios7i = Platform::OpenLocalFile(Config::DSiBIOS7Path, "rb");
     if (!bios7i)
         return false;
@@ -145,28 +147,21 @@ bool TitleManagerDialog::openNAND()
     fread(es_keyY, 16, 1, bios7i);
     fclose(bios7i);
 
-    curNAND = Platform::OpenLocalFile(Config::DSiNANDPath, "r+b");
-    if (!curNAND)
-        return false;
-
-    if (!DSi_NAND::Init(curNAND, es_keyY))
+    if (!DSi_NAND::Init(es_keyY))
     {
-        fclose(curNAND);
-        curNAND = nullptr;
         return false;
     }
 
+    NANDInited = true;
     return true;
 }
 
 void TitleManagerDialog::closeNAND()
 {
-    if (curNAND)
+    if (NANDInited)
     {
         DSi_NAND::DeInit();
-
-        fclose(curNAND);
-        curNAND = nullptr;
+        NANDInited = false;
     }
 }
 
diff --git a/src/frontend/qt_sdl/TitleManagerDialog.h b/src/frontend/qt_sdl/TitleManagerDialog.h
index 201e5e8..cba7047 100644
--- a/src/frontend/qt_sdl/TitleManagerDialog.h
+++ b/src/frontend/qt_sdl/TitleManagerDialog.h
@@ -45,7 +45,7 @@ public:
     explicit TitleManagerDialog(QWidget* parent);
     ~TitleManagerDialog();
 
-    static FILE* curNAND;
+    static bool NANDInited;
     static bool openNAND();
     static void closeNAND();
 
-- 
cgit v1.2.3