diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2019-06-17 00:17:26 +0200 |
|---|---|---|
| committer | David Marcec <dmarcecguzman@gmail.com> | 2019-06-17 00:17:26 +0200 |
| commit | 6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1 (patch) | |
| tree | 8fe27325135db3a1b8f7a9bf1fe68030b7a45d6f /src/core/hle/service/acc | |
| parent | Signalled accumulated_suspended_tick_changed_event on creation based on RE (diff) | |
| download | yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar.gz yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar.bz2 yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar.lz yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar.xz yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.tar.zst yuzu-6ca20ad7ba594fd01c01e8d56e5e02d84609d9e1.zip | |
Diffstat (limited to 'src/core/hle/service/acc')
| -rw-r--r-- | src/core/hle/service/acc/acc.cpp | 17 | ||||
| -rw-r--r-- | src/core/hle/service/acc/acc.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index f02f54f91..025714e5a 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -243,6 +243,8 @@ void Module::Interface::IsUserAccountSwitchLocked(Kernel::HLERequestContext& ctx if (nacp_unique != nullptr) { is_locked = nacp_unique->GetUserAccountSwitchLock(); + } else { + LOG_ERROR(Service_ACC, "nacp_unique is null!"); } } else { is_locked = nacp.GetUserAccountSwitchLock(); @@ -285,15 +287,18 @@ Module::Interface::Interface(std::shared_ptr<Module> module, Module::Interface::~Interface() = default; -void InstallInterfaces(SM::ServiceManager& service_manager) { +void InstallInterfaces(Core::System& system) { auto module = std::make_shared<Module>(); auto profile_manager = std::make_shared<ProfileManager>(); - Core::System& system = Core::System::GetInstance(); - std::make_shared<ACC_AA>(module, profile_manager, system)->InstallAsService(service_manager); - std::make_shared<ACC_SU>(module, profile_manager, system)->InstallAsService(service_manager); - std::make_shared<ACC_U0>(module, profile_manager, system)->InstallAsService(service_manager); - std::make_shared<ACC_U1>(module, profile_manager, system)->InstallAsService(service_manager); + std::make_shared<ACC_AA>(module, profile_manager, system) + ->InstallAsService(system.ServiceManager()); + std::make_shared<ACC_SU>(module, profile_manager, system) + ->InstallAsService(system.ServiceManager()); + std::make_shared<ACC_U0>(module, profile_manager, system) + ->InstallAsService(system.ServiceManager()); + std::make_shared<ACC_U1>(module, profile_manager, system) + ->InstallAsService(system.ServiceManager()); } } // namespace Service::Account diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h index 47a7c46d7..350f123a0 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/core/hle/service/acc/acc.h @@ -39,6 +39,6 @@ public: }; /// Registers all ACC services with the specified service manager. -void InstallInterfaces(SM::ServiceManager& service_manager); +void InstallInterfaces(Core::System& system); } // namespace Service::Account |