diff options
| author | OatmealDome <OatmealDome@users.noreply.github.com> | 2025-03-16 14:54:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-16 14:54:24 -0400 |
| commit | 9720b1f5f554f76a6d0e53d957234a75fa300f60 (patch) | |
| tree | ba2fe5a631dcf7d18878dc186bb511e7594835b6 /Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | |
| parent | 9e513d93e16876cc1d5bed285fa09a8993fdf796 (diff) | |
| parent | 5b88c0b90e13d8e2e11c33b7d61579b6b45dc5f9 (diff) | |
Merge pull request #13411 from jordan-woyak/gui-vconfig
DolphinQt/GeneralWidget: Eliminate unnecessary g_Config usage.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index 8d69589f29..19af3a47f6 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -165,7 +165,6 @@ void GeneralWidget::ConnectWidgets() // Video Backend connect(m_backend_combo, &QComboBox::currentIndexChanged, this, &GeneralWidget::BackendWarning); connect(m_adapter_combo, &QComboBox::currentIndexChanged, this, [&](int index) { - g_Config.iAdapter = index; Config::SetBaseOrCurrent(Config::GFX_ADAPTER, index); emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); }); @@ -369,7 +368,10 @@ void GeneralWidget::OnBackendChanged(const QString& backend_name) const bool supports_adapters = !adapters.empty(); - m_adapter_combo->setCurrentIndex(g_Config.iAdapter); + const int adapter_index = Config::Get(Config::GFX_ADAPTER); + if (adapter_index < m_adapter_combo->count()) + m_adapter_combo->setCurrentIndex(adapter_index); + m_adapter_combo->setEnabled(supports_adapters && Core::IsUninitialized(Core::System::GetInstance())); |
