From a16e3544682d69f5b3c82e079157eccc9337a7e6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 5 Oct 2016 10:16:32 -0700 Subject: [PATCH] Qt: Fix showing default display driver as OpenGL (force 1.x) --- CHANGES | 1 + src/platform/qt/SettingsView.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1161c1caf..44551e540 100644 --- a/CHANGES +++ b/CHANGES @@ -27,6 +27,7 @@ Bugfixes: - 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 diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp index ae5167512..53c1d912e 100644 --- a/src/platform/qt/SettingsView.cpp +++ b/src/platform/qt/SettingsView.cpp @@ -124,7 +124,7 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC #ifdef BUILD_GL m_ui.displayDriver->addItem(tr("OpenGL (force version 1.x)"), static_cast(Display::Driver::OPENGL1)); - if (displayDriver.isNull() || displayDriver.toInt() == static_cast(Display::Driver::OPENGL1)) { + if (!displayDriver.isNull() && displayDriver.toInt() == static_cast(Display::Driver::OPENGL1)) { m_ui.displayDriver->setCurrentIndex(m_ui.displayDriver->count() - 1); } #endif