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

Merge pull request #8171 from Pokechu22/backend-changing-fix 

Disallow changing the backend when running when software renderer is currently selected
This commit is contained in:
Léo Lam 2019-06-20 13:58:01 +02:00 committed by GitHub
parent 4edf174b61 adfbbe3a02
commit 3cafd0ae81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
View File

@ -13,6 +13,7 @@
#include "Core/Config/GraphicsSettings.h" #include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "DolphinQt/Config/Graphics/GraphicsBool.h" #include "DolphinQt/Config/Graphics/GraphicsBool.h"
#include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h"
@ -26,12 +27,15 @@
SoftwareRendererWidget::SoftwareRendererWidget(GraphicsWindow* parent) : GraphicsWidget(parent) SoftwareRendererWidget::SoftwareRendererWidget(GraphicsWindow* parent) : GraphicsWidget(parent)
{ {
CreateWidgets(); CreateWidgets();
connect(parent, &GraphicsWindow::BackendChanged, [this] { LoadSettings(); });
LoadSettings(); LoadSettings();
ConnectWidgets(); ConnectWidgets();
AddDescriptions(); AddDescriptions();
emit BackendChanged(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend));
connect(parent, &GraphicsWindow::BackendChanged, [this] { LoadSettings(); });
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
[=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); });
OnEmulationStateChanged(Core::GetState() != Core::State::Uninitialized);
} }
void SoftwareRendererWidget::CreateWidgets() void SoftwareRendererWidget::CreateWidgets()
@ -180,3 +184,8 @@ void SoftwareRendererWidget::AddDescriptions()
AddDescription(m_dump_tev_stages, TR_DUMP_TEV_STAGES_DESCRIPTION); AddDescription(m_dump_tev_stages, TR_DUMP_TEV_STAGES_DESCRIPTION);
AddDescription(m_dump_tev_fetches, TR_DUMP_TEV_FETCHES_DESCRIPTION); AddDescription(m_dump_tev_fetches, TR_DUMP_TEV_FETCHES_DESCRIPTION);
} }
void SoftwareRendererWidget::OnEmulationStateChanged(bool running)
{
m_backend_combo->setEnabled(!running);
}

2
Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
View File

@ -28,6 +28,8 @@ private:
void ConnectWidgets(); void ConnectWidgets();
void AddDescriptions(); void AddDescriptions();
void OnEmulationStateChanged(bool running);
QComboBox* m_backend_combo; QComboBox* m_backend_combo;
QCheckBox* m_show_statistics; QCheckBox* m_show_statistics;
QCheckBox* m_dump_textures; QCheckBox* m_dump_textures;