Qt: Fix showing default display driver as OpenGL (force 1.x)

This commit is contained in:
Jeffrey Pfau 2016-10-05 10:16:32 -07:00
parent 792eb29354
commit a16e354468
2 changed files with 2 additions and 1 deletions

View File

@ -27,6 +27,7 @@ Bugfixes:
- Qt: Fix patch loading - Qt: Fix patch loading
- Qt: Fix crash when saving an override if a game isn't loaded - Qt: Fix crash when saving an override if a game isn't loaded
- GB: Properly unload save files when unloading a ROM - GB: Properly unload save files when unloading a ROM
- Qt: Fix showing default display driver as OpenGL (force 1.x)
Misc: Misc:
- All: Only update version info if needed - All: Only update version info if needed
- FFmpeg: Encoding cleanup - FFmpeg: Encoding cleanup

View File

@ -124,7 +124,7 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC
#ifdef BUILD_GL #ifdef BUILD_GL
m_ui.displayDriver->addItem(tr("OpenGL (force version 1.x)"), static_cast<int>(Display::Driver::OPENGL1)); 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); m_ui.displayDriver->setCurrentIndex(m_ui.displayDriver->count() - 1);
} }
#endif #endif