From f4b721ac0639ec0451d35908551fd9df2c837ab8 Mon Sep 17 00:00:00 2001 From: yuzubot Date: Mon, 4 Mar 2024 13:02:54 +0000 Subject: [PATCH] "Merge Tagged PR 13018" --- src/core/core.cpp | 1 - src/core/hle/service/am/window_system.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index 83517d46cc..b0e5f6edcd 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -451,7 +451,6 @@ struct System::Impl { return Loader::ResultStatus::ErrorNotInitialized; return app_loader->ReadTitle(out); } - void SetStatus(SystemResultStatus new_status, const char* details = nullptr) { status = new_status; if (details) { diff --git a/src/core/hle/service/am/window_system.cpp b/src/core/hle/service/am/window_system.cpp index ca289a84d1..5cf24007cc 100644 --- a/src/core/hle/service/am/window_system.cpp +++ b/src/core/hle/service/am/window_system.cpp @@ -121,7 +121,7 @@ void WindowSystem::RequestAppletVisibilityState(Applet& applet, bool visible) { void WindowSystem::OnOperationModeChanged() { std::scoped_lock lk{m_lock}; - for (const auto& [_, applet] : m_applets) { + for (const auto& [aruid, applet] : m_applets) { std::scoped_lock lk2{applet->lock}; applet->lifecycle_manager.OnOperationAndPerformanceModeChanged(); } @@ -130,7 +130,7 @@ void WindowSystem::OnOperationModeChanged() { void WindowSystem::OnExitRequested() { std::scoped_lock lk{m_lock}; - for (const auto& [_, applet] : m_applets) { + for (const auto& [aruid, applet] : m_applets) { std::scoped_lock lk2{applet->lock}; applet->lifecycle_manager.RequestExit(); } @@ -156,7 +156,7 @@ void WindowSystem::OnHomeButtonPressed(ButtonPressDuration type) { void WindowSystem::PruneTerminatedAppletsLocked() { for (auto it = m_applets.begin(); it != m_applets.end(); /* ... */) { - const auto& [_, applet] = *it; + const auto& [aruid, applet] = *it; std::scoped_lock lk{applet->lock};