Skip to content

Commit

Permalink
Qt: Fix showing default display driver as OpenGL (force 1.x)
Browse files Browse the repository at this point in the history
  • Loading branch information
endrift committed Oct 5, 2016
1 parent 792eb29 commit a16e354
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/platform/qt/SettingsView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<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
Expand Down

0 comments on commit a16e354

Please sign in to comment.