Skip to content
Permalink
Browse files

Merge pull request #8424 from JosJuice/cpu-core-advanced-cleanup

DolphinQt: Cleanup after moving CPU Emulation Engine to Advanced tab
  • Loading branch information...
lioncash committed Oct 24, 2019
2 parents 780d34d + 95c4423 commit 291c056c073fb474ab9fcbc7c57709f37c869404
@@ -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);
}
@@ -30,7 +30,6 @@ class AdvancedPane final : public QWidget
void CreateLayout();
void ConnectLayout();
void Update();
void OnEmulationStateChanged(Core::State state);

QComboBox* m_cpu_emulation_engine_combobox;
QCheckBox* m_cpu_clock_override_checkbox;

0 comments on commit 291c056

Please sign in to comment.
You can’t perform that action at this time.