From e2040146ea06c765cd019f754d9236f5d8516818 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 2 Feb 2022 20:24:39 -0800 Subject: [PATCH] Qt: Enable -b for Boot BIOS menu option (fixes #2074) --- CHANGES | 1 + src/platform/qt/Window.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 09ed6f0cb..c35632def 100644 --- a/CHANGES +++ b/CHANGES @@ -46,6 +46,7 @@ Misc: - Qt: Add optional frame counter to OSD (closes mgba.io/i/1728) - Qt: Add optional emulation-related information on reset (closes mgba.io/i/1780) - Qt: Add QOpenGLWidget cross-thread codepath for macOS (fixes mgba.io/i/1754) + - Qt: Enable -b for Boot BIOS menu option (fixes mgba.io/i/2074) - Windows: Attach to console if present 0.9.3: (2021-12-17) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 32de87dbe..76bcacebc 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -348,7 +348,11 @@ void Window::selectROM() { } 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