From 8df56cb319fd59ceab1122580fe5a318b0344cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 4 May 2020 01:21:51 +0200 Subject: Migrate video backend setting to the new config system Fixes https://bugs.dolphin-emu.org/issues/12087 --- Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp') diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp index 5af91d0ff5..c1e7c5f73f 100644 --- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp @@ -12,6 +12,7 @@ #include #include "Core/Config/GraphicsSettings.h" +#include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -30,7 +31,7 @@ SoftwareRendererWidget::SoftwareRendererWidget(GraphicsWindow* parent) : Graphic LoadSettings(); ConnectWidgets(); AddDescriptions(); - emit BackendChanged(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend)); + emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND))); connect(parent, &GraphicsWindow::BackendChanged, [this] { LoadSettings(); }); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, @@ -123,9 +124,11 @@ void SoftwareRendererWidget::LoadSettings() { for (const auto& backend : g_available_video_backends) { - if (backend->GetName() == SConfig::GetInstance().m_strVideoBackend) + if (backend->GetName() == Config::Get(Config::MAIN_GFX_BACKEND)) + { m_backend_combo->setCurrentIndex( m_backend_combo->findText(tr(backend->GetDisplayName().c_str()))); + } } m_object_range_min->setValue(Config::Get(Config::GFX_SW_DRAW_START)); @@ -139,7 +142,7 @@ void SoftwareRendererWidget::SaveSettings() if (tr(backend->GetDisplayName().c_str()) == m_backend_combo->currentText()) { const auto backend_name = backend->GetName(); - if (backend_name != SConfig::GetInstance().m_strVideoBackend) + if (backend_name != Config::Get(Config::MAIN_GFX_BACKEND)) emit BackendChanged(QString::fromStdString(backend_name)); break; } -- cgit v1.2.3