From e7e94850072a04bfcf94f0c32e1fb219d2c30ddb Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 2 Feb 2022 20:24:39 -0800
Subject: [PATCH] Qt: Enable -b for Boot BIOS menu option (fixes #2074)

---
 CHANGES                    | 2 ++
 src/platform/qt/Window.cpp | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a551be71b..8a6220110 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Other fixes:
  - FFmpeg: Fix crash when encoding audio with some containers
  - FFmpeg: Fix GIF recording (fixes mgba.io/i/2393)
  - 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)
 Emulation fixes:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 3be4f850d..e3e36c242 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -329,7 +329,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