piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-27 17:39:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

multi-instance: load firmware from correct instance-specific file (load from original file if not found)

Browse Source
This commit is contained in:
Arisotura
2025-06-15 01:42:24 +02:00
parent 0b005abedf
commit 79f12de480
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -1013,28 +1013,35 @@ std::optional<Firmware> EmuInstance::loadFirmware(int type) noexcept
return generateFirmware(type);
}
}
//const string& firmwarepath = type == 1 ? Config::DSiFirmwarePath : Config::FirmwarePath;
string firmwarepath;
if (type == 1)
firmwarepath = globalCfg.GetString("DSi.FirmwarePath");
else
firmwarepath = globalCfg.GetString("DS.FirmwarePath");
Log(Debug, "SPI firmware: loading from file %s\n", firmwarepath.c_str());
string fwpath_inst = firmwarepath + instanceFileSuffix();
FileHandle* file = OpenLocalFile(firmwarepath, Read);
Log(Debug, "Loading firmware from file %s\n", fwpath_inst.c_str());
FileHandle* file = OpenLocalFile(fwpath_inst, Read);
if (!file)
{
Log(Error, "SPI firmware: couldn't open firmware file!\n");
Log(Debug, "Loading firmware from file %s\n", firmwarepath.c_str());
file = OpenLocalFile(firmwarepath, Read);
if (!file)
{
Log(Error, "Couldn't open firmware file!\n");
return std::nullopt;
}
}
Firmware firmware(file);
CloseFile(file);
if (!firmware.Buffer())
{
Log(Error, "SPI firmware: couldn't read firmware file!\n");
Log(Error, "Couldn't read firmware file!\n");
return std::nullopt;
}