Browse Source

Revert "Fix Mario Kart 8 Deluxe control applet freeze (#149)"

This reverts commit 7eb5710f35.

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3230/head
crueter 1 month ago
parent
commit
e56a0d7d4e
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 6
      src/core/hle/service/am/applet.cpp
  2. 6
      src/core/hle/service/am/service/library_applet_accessor.cpp

6
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();
}
}

6
src/core/hle/service/am/service/library_applet_accessor.cpp

@ -110,12 +110,6 @@ Result ILibraryAppletAccessor::PushInData(SharedPointer<IStorage> storage) {
Result ILibraryAppletAccessor::PopOutData(Out<SharedPointer<IStorage>> 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()));
}

Loading…
Cancel
Save