piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 07:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

properly make the DSi NAND instance-unique

Browse Source
This commit is contained in:
Arisotura
2022-09-23 22:53:23 +02:00
parent fc11258071
commit 86786738cc
6 changed files with 80 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/qt_sdl/TitleManagerDialog.cpp
View File

@ -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;
}
}

2
src/frontend/qt_sdl/TitleManagerDialog.h
View File

@ -45,7 +45,7 @@ public:
explicit TitleManagerDialog(QWidget* parent);
~TitleManagerDialog();
static FILE* curNAND;
static bool NANDInited;
static bool openNAND();
static void closeNAND();