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 #8424 from JosJuice/cpu-core-advanced-cleanup 

DolphinQt: Cleanup after moving CPU Emulation Engine to Advanced tab
This commit is contained in:
Mat M 2019-10-23 20:16:32 -04:00 committed by GitHub
parent 780d34dbca 95c4423f4c
commit 291c056c07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -40,8 +40,6 @@ AdvancedPane::AdvancedPane(QWidget* parent) : QWidget(parent)
ConnectLayout(); ConnectLayout();
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &AdvancedPane::Update); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &AdvancedPane::Update);
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
&AdvancedPane::OnEmulationStateChanged);
} }
void AdvancedPane::CreateLayout() void AdvancedPane::CreateLayout()
@ -134,7 +132,6 @@ void AdvancedPane::ConnectLayout()
[this](int index) { [this](int index) {
SConfig::GetInstance().cpu_core = PowerPC::AvailableCPUCores()[index]; SConfig::GetInstance().cpu_core = PowerPC::AvailableCPUCores()[index];
Config::SetBaseOrCurrent(Config::MAIN_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); 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) if (available_cpu_cores[i] == SConfig::GetInstance().cpu_core)
m_cpu_emulation_engine_combobox->setCurrentIndex(i); m_cpu_emulation_engine_combobox->setCurrentIndex(i);
} }
m_cpu_emulation_engine_combobox->setEnabled(!running);
QFont bf = font(); QFont bf = font();
bf.setBold(Config::GetActiveLayerForConfig(Config::MAIN_OVERCLOCK_ENABLE) != bf.setBold(Config::GetActiveLayerForConfig(Config::MAIN_OVERCLOCK_ENABLE) !=
@ -205,9 +203,3 @@ void AdvancedPane::Update()
m_custom_rtc_checkbox->setEnabled(!running); m_custom_rtc_checkbox->setEnabled(!running);
m_custom_rtc_datetime->setEnabled(enable_custom_rtc_widgets); 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);
}

1
Source/Core/DolphinQt/Settings/AdvancedPane.h
View File

@ -30,7 +30,6 @@ private:
void CreateLayout(); void CreateLayout();
void ConnectLayout(); void ConnectLayout();
void Update(); void Update();
void OnEmulationStateChanged(Core::State state);
QComboBox* m_cpu_emulation_engine_combobox; QComboBox* m_cpu_emulation_engine_combobox;
QCheckBox* m_cpu_clock_override_checkbox; QCheckBox* m_cpu_clock_override_checkbox;