ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the issues Nadia pointed out

This commit is contained in:
Arisotura 2022-01-07 13:21:55 +01:00
parent 145c1639fb
commit d7c90050af
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ public:
} }
currentDlg = new FirmwareSettingsDialog(parent); currentDlg = new FirmwareSettingsDialog(parent);
currentDlg->show(); currentDlg->open();
return currentDlg; return currentDlg;
} }
static void closeDlg() static void closeDlg()

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

@ -43,7 +43,7 @@ public:
} }
currentDlg = new PathSettingsDialog(parent); currentDlg = new PathSettingsDialog(parent);
currentDlg->show(); currentDlg->open();
return currentDlg; return currentDlg;
} }
static void closeDlg() static void closeDlg()

16
src/frontend/qt_sdl/ROMManager.cpp
View File

@ -411,6 +411,22 @@ void Reset()
if (Config::ConsoleType == 1) EjectGBACart(); if (Config::ConsoleType == 1) EjectGBACart();
NDS::Reset(); NDS::Reset();
if ((CartType != -1) && NDSSave)
{
std::string oldsave = NDSSave->GetPath();
std::string newsave = GetAssetPath(false, Config::SaveFilePath, ".sav");
if (oldsave != newsave)
NDSSave->SetPath(newsave, false);
}
if ((GBACartType != -1) && GBASave)
{
std::string oldsave = GBASave->GetPath();
std::string newsave = GetAssetPath(true, Config::SaveFilePath, ".sav");
if (oldsave != newsave)
GBASave->SetPath(newsave, false);
}
if (!BaseROMName.empty()) if (!BaseROMName.empty())
{ {
if (Config::DirectBoot || NDS::NeedsDirectBoot()) if (Config::DirectBoot || NDS::NeedsDirectBoot())