am: migrate global state to per-applet state structure

1 files changed, 5 insertions, 4 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 8c04685a5..435ef6793 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -392,6 +392,7 @@ struct System::Impl {
         // All threads are started, begin main process execution, now that we're in the clear.
         main_process->Run(load_parameters->main_thread_priority,
                           load_parameters->main_thread_stack_size);
+        main_process->Close();
 
         if (Settings::values.gamecard_inserted) {
             if (Settings::values.gamecard_current_game) {
@@ -886,10 +887,6 @@ void System::SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set
     impl->frontend_applets.SetFrontendAppletSet(std::move(set));
 }
 
-void System::SetDefaultAppletFrontendSet() {
-    impl->frontend_applets.SetDefaultAppletFrontendSet();
-}
-
 Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHolder() {
     return impl->frontend_applets;
 }
@@ -898,6 +895,10 @@ const Service::AM::Frontend::FrontendAppletHolder& System::GetFrontendAppletHold
     return impl->frontend_applets;
 }
 
+Service::AM::AppletManager& System::GetAppletManager() {
+    return impl->applet_manager;
+}
+
 void System::SetContentProvider(std::unique_ptr<FileSys::ContentProviderUnion> provider) {
     impl->content_provider = std::move(provider);
 }