ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt/GeneralWidget: Restore the adapter properly

This commit is contained in:
spycrab 2018-05-14 21:09:43 +02:00
parent 159f6115e2
commit e922f91cc3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp
View File

@ -131,7 +131,12 @@ void GeneralWidget::ConnectWidgets()
{ {
// Video Backend // Video Backend
connect(m_backend_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), connect(m_backend_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
[this](int) { SaveSettings(); }); this, &GeneralWidget::SaveSettings);
connect(m_adapter_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, [](int index) {
g_Config.iAdapter = index;
Config::SetBaseOrCurrent(Config::GFX_ADAPTER, index);
});
for (QCheckBox* checkbox : {m_enable_fullscreen, m_render_main_window, m_autoadjust_window_size}) for (QCheckBox* checkbox : {m_enable_fullscreen, m_render_main_window, m_autoadjust_window_size})
connect(checkbox, &QCheckBox::toggled, this, &GeneralWidget::SaveSettings); connect(checkbox, &QCheckBox::toggled, this, &GeneralWidget::SaveSettings);
@ -163,8 +168,6 @@ void GeneralWidget::LoadSettings()
void GeneralWidget::SaveSettings() void GeneralWidget::SaveSettings()
{ {
g_Config.iAdapter = m_adapter_combo->currentIndex();
// Video Backend // Video Backend
for (const auto& backend : g_available_video_backends) for (const auto& backend : g_available_video_backends)
{ {
@ -329,6 +332,8 @@ void GeneralWidget::OnBackendChanged(const QString& backend_name)
} }
} }
const bool old = m_adapter_combo->blockSignals(true);
m_adapter_combo->clear(); m_adapter_combo->clear();
const auto& adapters = g_Config.backend_info.Adapters; const auto& adapters = g_Config.backend_info.Adapters;
@ -338,4 +343,6 @@ void GeneralWidget::OnBackendChanged(const QString& backend_name)
m_adapter_combo->setCurrentIndex(g_Config.iAdapter); m_adapter_combo->setCurrentIndex(g_Config.iAdapter);
m_adapter_combo->setEnabled(!adapters.empty()); m_adapter_combo->setEnabled(!adapters.empty());
m_adapter_combo->blockSignals(old);
} }