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

Qt: Enable -b for Boot BIOS menu option (fixes #2074)

This commit is contained in:
Vicki Pfau 2022-02-02 20:24:39 -08:00
parent c759fbf65c
commit e7e9485007
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -8,6 +8,8 @@ Other fixes:
- FFmpeg: Fix crash when encoding audio with some containers - FFmpeg: Fix crash when encoding audio with some containers
- FFmpeg: Fix GIF recording (fixes mgba.io/i/2393) - FFmpeg: Fix GIF recording (fixes mgba.io/i/2393)
- GB, GBA: Save writeback-pending masked saves on unload (fixes mgba.io/i/2396) - GB, GBA: Save writeback-pending masked saves on unload (fixes mgba.io/i/2396)
Misc:
- Qt: Enable -b for Boot BIOS menu option (fixes mgba.io/i/2074)
0.9.3: (2021-12-17) 0.9.3: (2021-12-17)
Emulation fixes: Emulation fixes:

6
src/platform/qt/Window.cpp
View File

@ -329,7 +329,11 @@ void Window::selectROM() {
} }
void Window::bootBIOS() { void Window::bootBIOS() {
setController(m_manager->loadBIOS(mPLATFORM_GBA, m_config->getOption("gba.bios")), QString()); QString bios(m_config->getOption("gba.bios"));
if (bios.isEmpty()) {
bios = m_config->getOption("bios");
}
setController(m_manager->loadBIOS(mPLATFORM_GBA, bios), QString());
} }
#ifdef USE_SQLITE3 #ifdef USE_SQLITE3