diff options
| author | Mat M <mathew1800@gmail.com> | 2019-10-23 20:16:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 20:16:32 -0400 |
| commit | 291c056c073fb474ab9fcbc7c57709f37c869404 (patch) | |
| tree | ad4c63c9844f376794dff812dfa90423147ca9e9 /Source/Core | |
| parent | 780d34dbca75ea85f7478f9a49fa20a97b14878b (diff) | |
| parent | 95c4423f4ceb70902140dd9acdf95f34ed119d54 (diff) | |
Merge pull request #8424 from JosJuice/cpu-core-advanced-cleanup
DolphinQt: Cleanup after moving CPU Emulation Engine to Advanced tab
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/Settings/AdvancedPane.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/Settings/AdvancedPane.h | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp index 1de1746ecc..8562bb74b0 100644 --- a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp +++ b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp @@ -40,8 +40,6 @@ AdvancedPane::AdvancedPane(QWidget* parent) : QWidget(parent) ConnectLayout(); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &AdvancedPane::Update); - connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, - &AdvancedPane::OnEmulationStateChanged); } void AdvancedPane::CreateLayout() @@ -134,7 +132,6 @@ void AdvancedPane::ConnectLayout() [this](int index) { SConfig::GetInstance().cpu_core = PowerPC::AvailableCPUCores()[index]; Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]); - Update(); }); m_cpu_clock_override_checkbox->setChecked(SConfig::GetInstance().m_OCEnable); @@ -179,6 +176,7 @@ void AdvancedPane::Update() if (available_cpu_cores[i] == SConfig::GetInstance().cpu_core) m_cpu_emulation_engine_combobox->setCurrentIndex(i); } + m_cpu_emulation_engine_combobox->setEnabled(!running); QFont bf = font(); bf.setBold(Config::GetActiveLayerForConfig(Config::MAIN_OVERCLOCK_ENABLE) != @@ -205,9 +203,3 @@ void AdvancedPane::Update() m_custom_rtc_checkbox->setEnabled(!running); m_custom_rtc_datetime->setEnabled(enable_custom_rtc_widgets); } - -void AdvancedPane::OnEmulationStateChanged(Core::State state) -{ - const bool running = state != Core::State::Uninitialized; - m_cpu_emulation_engine_combobox->setEnabled(!running); -} diff --git a/Source/Core/DolphinQt/Settings/AdvancedPane.h b/Source/Core/DolphinQt/Settings/AdvancedPane.h index 123e35cd11..5b3ac07f1b 100644 --- a/Source/Core/DolphinQt/Settings/AdvancedPane.h +++ b/Source/Core/DolphinQt/Settings/AdvancedPane.h @@ -30,7 +30,6 @@ private: void CreateLayout(); void ConnectLayout(); void Update(); - void OnEmulationStateChanged(Core::State state); QComboBox* m_cpu_emulation_engine_combobox; QCheckBox* m_cpu_clock_override_checkbox; |