Просмотр исходного кода

Renamed CheckIfOperationChanged to OnDockedModeChanged

David Marcec 7 лет назад
Родитель
Сommit
40db288a2a
2 измененных файлов с 23 добавлено и 21 удалено
  1. 22 20
      src/yuzu/configuration/configure_general.cpp
  2. 1 1
      src/yuzu/configuration/configure_general.h

+ 22 - 20
src/yuzu/configuration/configure_general.cpp

@@ -41,25 +41,27 @@ void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) {
     ui->widget->Populate(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();
-
-        // 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<Service::AM::AppletOE>("appletOE");
-        auto applet_ae = sm.GetService<Service::AM::AppletAE>("appletAE");
-        bool has_signalled = false;
-
-        if (applet_oe != nullptr) {
-            applet_oe->GetMessageQueue()->OperationModeChanged();
-            has_signalled = true;
-        }
-
-        if (applet_ae != nullptr && !has_signalled) {
-            applet_ae->GetMessageQueue()->OperationModeChanged();
-        }
+void ConfigureGeneral::OnDockedModeChanged(bool last_state, bool new_state) {
+    if (last_state == new_state) {
+        return;
+    }
+
+    Core::System& system{Core::System::GetInstance()};
+    Service::SM::ServiceManager& sm = system.ServiceManager();
+
+    // 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<Service::AM::AppletOE>("appletOE");
+    auto applet_ae = sm.GetService<Service::AM::AppletAE>("appletAE");
+    bool has_signalled = false;
+
+    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();
     Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
     const bool pre_docked_mode = Settings::values.use_docked_mode;
     const bool pre_docked_mode = Settings::values.use_docked_mode;
     Settings::values.use_docked_mode = ui->use_docked_mode->isChecked();
     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();
     Settings::values.enable_nfc = ui->enable_nfc->isChecked();
 }
 }

+ 1 - 1
src/yuzu/configuration/configure_general.h

@@ -25,7 +25,7 @@ public:
 
 
 private:
 private:
     void setConfiguration();
     void setConfiguration();
-    void CheckIfOperationChanged(bool last_state, bool new_state);
+    void OnDockedModeChanged(bool last_state, bool new_state);
 
 
     std::unique_ptr<Ui::ConfigureGeneral> ui;
     std::unique_ptr<Ui::ConfigureGeneral> ui;
 };
 };