diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-01-01 22:42:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 22:42:30 +0100 |
| commit | 295d86c86f17a0155967344e2f24801745a685de (patch) | |
| tree | 01dea024753438d625f6dac959362f253c12fd72 /Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | |
| parent | 6e3a2324a4b018bc052aedebd149dc46afbc5699 (diff) | |
| parent | 1c68f4231b98faa5a5b286f3029471220b388d0d (diff) | |
Merge pull request #12455 from PatrickFerry/qt_handle_overridden_graphics_backend
Qt: Handle Overridden Graphics Backend
Diffstat (limited to 'Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index aa4a7c5563..5981c21348 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -182,7 +182,10 @@ void GeneralWidget::SaveSettings() { // Video Backend const auto current_backend = m_backend_combo->currentData().toString().toStdString(); - if (Config::Get(Config::MAIN_GFX_BACKEND) != current_backend) + if (Config::Get(Config::MAIN_GFX_BACKEND) == current_backend) + return; + + if (Config::GetActiveLayerForConfig(Config::MAIN_GFX_BACKEND) == Config::LayerType::Base) { auto warningMessage = VideoBackendBase::GetAvailableBackends()[m_backend_combo->currentIndex()] ->GetWarningMessage(); @@ -203,8 +206,10 @@ void GeneralWidget::SaveSettings() return; } } - emit BackendChanged(QString::fromStdString(current_backend)); } + + Config::SetBaseOrCurrent(Config::MAIN_GFX_BACKEND, current_backend); + emit BackendChanged(QString::fromStdString(current_backend)); } void GeneralWidget::OnEmulationStateChanged(bool running) @@ -215,6 +220,10 @@ void GeneralWidget::OnEmulationStateChanged(bool running) const bool supports_adapters = !g_Config.backend_info.Adapters.empty(); m_adapter_combo->setEnabled(!running && supports_adapters); + + std::string current_backend = m_backend_combo->currentData().toString().toStdString(); + if (Config::Get(Config::MAIN_GFX_BACKEND) != current_backend) + emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); } void GeneralWidget::AddDescriptions() |
