From 40db288a2a08b00eea9339fd61ce5f4a358dae8f Mon Sep 17 00:00:00 2001 From: David Marcec Date: Thu, 8 Nov 2018 12:12:00 +1100 Subject: [PATCH] Renamed CheckIfOperationChanged to OnDockedModeChanged --- src/yuzu/configuration/configure_general.cpp | 36 +++++++++++--------- src/yuzu/configuration/configure_general.h | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 201d7a4c57..b322258a00 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -41,25 +41,27 @@ void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) { ui->widget->Populate(registry); } -void ConfigureGeneral::CheckIfOperationChanged(bool last_state, bool new_state) { - if (last_state != new_state) { - Core::System& system{Core::System::GetInstance()}; - Service::SM::ServiceManager& sm = system.ServiceManager(); +void ConfigureGeneral::OnDockedModeChanged(bool last_state, bool new_state) { + if (last_state == new_state) { + return; + } - // Message queue is shared between these services, we just need to signal an operation - // change to one and it will handle both automatically - auto applet_oe = sm.GetService("appletOE"); - auto applet_ae = sm.GetService("appletAE"); - bool has_signalled = false; + Core::System& system{Core::System::GetInstance()}; + Service::SM::ServiceManager& sm = system.ServiceManager(); - if (applet_oe != nullptr) { - applet_oe->GetMessageQueue()->OperationModeChanged(); - has_signalled = true; - } + // Message queue is shared between these services, we just need to signal an operation + // change to one and it will handle both automatically + auto applet_oe = sm.GetService("appletOE"); + auto applet_ae = sm.GetService("appletAE"); + bool has_signalled = false; - if (applet_ae != nullptr && !has_signalled) { - applet_ae->GetMessageQueue()->OperationModeChanged(); - } + if (applet_oe != nullptr) { + applet_oe->GetMessageQueue()->OperationModeChanged(); + has_signalled = true; + } + + if (applet_ae != nullptr && !has_signalled) { + applet_ae->GetMessageQueue()->OperationModeChanged(); } } @@ -72,7 +74,7 @@ void ConfigureGeneral::applyConfiguration() { Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked(); const bool pre_docked_mode = Settings::values.use_docked_mode; Settings::values.use_docked_mode = ui->use_docked_mode->isChecked(); - CheckIfOperationChanged(pre_docked_mode, Settings::values.use_docked_mode); + OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode); Settings::values.enable_nfc = ui->enable_nfc->isChecked(); } diff --git a/src/yuzu/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index e4ce3c04cb..2210d48da1 100644 --- a/src/yuzu/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h @@ -25,7 +25,7 @@ public: private: void setConfiguration(); - void CheckIfOperationChanged(bool last_state, bool new_state); + void OnDockedModeChanged(bool last_state, bool new_state); std::unique_ptr ui; };