1 files changed, 10 insertions, 15 deletions

diff --git a/src/frontend/qt_sdl/TitleManagerDialog.cpp b/src/frontend/qt_sdl/TitleManagerDialog.cpp
index 0a5e65d..8087ee6 100644
--- a/src/frontend/qt_sdl/TitleManagerDialog.cpp
+++ b/src/frontend/qt_sdl/TitleManagerDialog.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2016-2021 Arisotura
+    Copyright 2016-2022 melonDS team
 
     This file is part of melonDS.
 
@@ -23,7 +23,7 @@
 #include "types.h"
 #include "Platform.h"
 #include "Config.h"
-#include "FrontendUtil.h"
+#include "ROMManager.h"
 #include "DSi_NAND.h"
 
 #include "TitleManagerDialog.h"
@@ -31,7 +31,7 @@
 #include "ui_TitleImportDialog.h"
 
 
-FILE* TitleManagerDialog::curNAND = nullptr;
+bool TitleManagerDialog::NANDInited = false;
 TitleManagerDialog* TitleManagerDialog::currentDlg = nullptr;
 
 extern std::string EmuDirectory;
@@ -111,7 +111,7 @@ void TitleManagerDialog::createTitleItem(u32 category, u32 titleid)
     DSi_NAND::GetTitleInfo(category, titleid, version, &header, &banner);
 
     u32 icondata[32*32];
-    Frontend::ROMIcon(banner.Icon, banner.Palette, icondata);
+    ROMManager::ROMIcon(banner.Icon, banner.Palette, icondata);
     QImage iconimg((const uchar*)icondata, 32, 32, QImage::Format_ARGB32);
     QIcon icon(QPixmap::fromImage(iconimg.copy()));
 
@@ -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;
     }
 }