From e56a0d7d4e524f7b6aabf27cffc470e38c98d153 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 29 Dec 2025 19:43:12 -0500 Subject: [PATCH] Revert "Fix Mario Kart 8 Deluxe control applet freeze (#149)" This reverts commit 7eb5710f353798b05b8860187e2728f7795717a0. Signed-off-by: crueter --- src/core/hle/service/am/applet.cpp | 6 +++--- src/core/hle/service/am/service/library_applet_accessor.cpp | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/core/hle/service/am/applet.cpp b/src/core/hle/service/am/applet.cpp index 2ae3102aff..717afd61ad 100644 --- a/src/core/hle/service/am/applet.cpp +++ b/src/core/hle/service/am/applet.cpp @@ -29,7 +29,7 @@ void Applet::UpdateSuspensionStateLocked(bool force_message) { // Remove any forced resumption. lifecycle_manager.RemoveForceResumeIfPossible(); - const bool update_requested_focus_state = lifecycle_manager.UpdateRequestedFocusState(); + // Check if we're runnable. const bool curr_activity_runnable = lifecycle_manager.IsRunnable(); const bool prev_activity_runnable = is_activity_runnable; const bool was_changed = curr_activity_runnable != prev_activity_runnable; @@ -39,7 +39,6 @@ void Applet::UpdateSuspensionStateLocked(bool force_message) { process->Suspend(false); } else { process->Suspend(true); - lifecycle_manager.RequestResumeNotification(); } is_activity_runnable = curr_activity_runnable; @@ -51,7 +50,8 @@ void Applet::UpdateSuspensionStateLocked(bool force_message) { } // Signal if the focus state was changed or the process state was changed. - if (update_requested_focus_state || was_changed || force_message) { + if (lifecycle_manager.UpdateRequestedFocusState() || was_changed || force_message) { + lifecycle_manager.RequestResumeNotification(); lifecycle_manager.SignalSystemEventIfNeeded(); } } diff --git a/src/core/hle/service/am/service/library_applet_accessor.cpp b/src/core/hle/service/am/service/library_applet_accessor.cpp index c1d2943799..420188adac 100644 --- a/src/core/hle/service/am/service/library_applet_accessor.cpp +++ b/src/core/hle/service/am/service/library_applet_accessor.cpp @@ -110,12 +110,6 @@ Result ILibraryAppletAccessor::PushInData(SharedPointer storage) { Result ILibraryAppletAccessor::PopOutData(Out> out_storage) { LOG_DEBUG(Service_AM, "called"); - if (auto caller_applet = m_applet->caller_applet.lock(); caller_applet) { - caller_applet->lifecycle_manager.GetSystemEvent().Signal(); - caller_applet->lifecycle_manager.RequestResumeNotification(); - caller_applet->lifecycle_manager.GetSystemEvent().Clear(); - caller_applet->lifecycle_manager.UpdateRequestedFocusState(); - } R_RETURN(m_broker->GetOutData().Pop(out_storage.Get())); }