diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-09-15 18:45:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 18:45:17 +0200 |
| commit | 0d078219358b04266206ea1e2622396db7724136 (patch) | |
| tree | efafafd00041afae7f3d390e19a0a4a5d650f9fe /Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp | |
| parent | 30dd544931575f5136bc4a5cc972d0f3c55979c5 (diff) | |
| parent | 3e1072b24dd8f60fd13b9aca3527066d478f9774 (diff) | |
Merge pull request #6024 from ligfx/coreonstatechangedcallback
Qt: use Settings::EmulationStateChanged
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp index 3a6f81c2b2..f746b711bb 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp @@ -15,9 +15,11 @@ #include "Core/Config/GraphicsSettings.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "DolphinQt2/Config/Graphics/GraphicsBool.h" #include "DolphinQt2/Config/Graphics/GraphicsChoice.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h" +#include "DolphinQt2/Settings.h" #include "UICommon/VideoUtils.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" @@ -32,8 +34,8 @@ GeneralWidget::GeneralWidget(X11Utils::XRRConfiguration* xrr_config, GraphicsWin emit BackendChanged(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend)); connect(parent, &GraphicsWindow::BackendChanged, this, &GeneralWidget::OnBackendChanged); - connect(parent, &GraphicsWindow::EmulationStarted, [this] { OnEmulationStateChanged(true); }); - connect(parent, &GraphicsWindow::EmulationStopped, [this] { OnEmulationStateChanged(false); }); + connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, + [=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); }); } void GeneralWidget::CreateWidgets() |