all repos — mgba @ 11d6ab7f9d3998267ba8750e352f2a4537f73acc

mGBA Game Boy Advance Emulator

Qt: Fix showing default display driver as OpenGL (force 1.x)
Jeffrey Pfau jeffrey@endrift.com
Wed, 05 Oct 2016 10:16:32 -0700
commit

11d6ab7f9d3998267ba8750e352f2a4537f73acc

parent

13b6adee5653d733c2c1d2031fb20a774802a1fe

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -30,6 +30,7 @@ - GBA Memory: Fix several unused I/O register read values

- Qt: Fix patch loading - Qt: Fix crash when saving an override if a game isn't loaded - GB: Properly unload save files when unloading a ROM + - Qt: Fix showing default display driver as OpenGL (force 1.x) Misc: - All: Only update version info if needed - FFmpeg: Encoding cleanup
M src/platform/qt/SettingsView.cppsrc/platform/qt/SettingsView.cpp

@@ -124,7 +124,7 @@ #endif

#ifdef BUILD_GL m_ui.displayDriver->addItem(tr("OpenGL (force version 1.x)"), static_cast<int>(Display::Driver::OPENGL1)); - if (displayDriver.isNull() || displayDriver.toInt() == static_cast<int>(Display::Driver::OPENGL1)) { + if (!displayDriver.isNull() && displayDriver.toInt() == static_cast<int>(Display::Driver::OPENGL1)) { m_ui.displayDriver->setCurrentIndex(m_ui.displayDriver->count() - 1); } #endif