From 8e0a40434c8cc1de7b7262c0439380e5eca3e42a Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 27 Jan 2024 14:39:55 -0500 Subject: am: stop emulation when all applets are closed --- src/core/hle/service/am/applet_manager.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/core/hle/service/am/applet_manager.cpp b/src/core/hle/service/am/applet_manager.cpp index a733525a2..52200d5b2 100644 --- a/src/core/hle/service/am/applet_manager.cpp +++ b/src/core/hle/service/am/applet_manager.cpp @@ -221,6 +221,7 @@ void AppletManager::InsertApplet(std::shared_ptr applet) { void AppletManager::TerminateAndRemoveApplet(AppletResourceUserId aruid) { std::shared_ptr applet; + bool should_stop = false; { std::scoped_lock lk{m_lock}; @@ -231,10 +232,17 @@ void AppletManager::TerminateAndRemoveApplet(AppletResourceUserId aruid) { applet = it->second; m_applets.erase(it); + + should_stop = m_applets.empty(); } // Terminate process. applet->process->Terminate(); + + // If there were no applets left, stop emulation. + if (should_stop) { + m_system.Exit(); + } } void AppletManager::CreateAndInsertByFrontendAppletParameters( -- cgit v1.2.3