From fe5ef4bf656cb42c211e88fbbee4e9d20d14e546 Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Sat, 3 Oct 2026 23:17:04 +0200
Subject: [PATCH] mic+nn_aoc+nn_fp: Reset more state on title start

---
 src/Cafe/OS/libs/mic/mic.cpp       | 7 +++++++
 src/Cafe/OS/libs/nn_aoc/nn_aoc.cpp | 2 ++
 src/Cafe/OS/libs/nn_fp/nn_fp.cpp   | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/Cafe/OS/libs/mic/mic.cpp b/src/Cafe/OS/libs/mic/mic.cpp
index 8d3f0528..2e7cbedd 100644
--- a/src/Cafe/OS/libs/mic/mic.cpp
+++ b/src/Cafe/OS/libs/mic/mic.cpp
@@ -465,8 +465,15 @@ namespace mic
 			return "mic";
 		}
 
+		void RPLUnmapped() override
+		{
+			std::unique_lock lock(g_audioInputMutex);
+			mic_updateDevicePlayState(false);
+		}
+
 		void RPLMapped() override
 		{
+			MICStatus = {};
 			osLib_addFunction("mic", "MICInit", micExport_MICInit);
 			osLib_addFunction("mic", "MICOpen", micExport_MICOpen);
 			osLib_addFunction("mic", "MICClose", micExport_MICClose);
diff --git a/src/Cafe/OS/libs/nn_aoc/nn_aoc.cpp b/src/Cafe/OS/libs/nn_aoc/nn_aoc.cpp
index e8619940..39209489 100644
--- a/src/Cafe/OS/libs/nn_aoc/nn_aoc.cpp
+++ b/src/Cafe/OS/libs/nn_aoc/nn_aoc.cpp
@@ -159,6 +159,8 @@ namespace nn
 
 			void RPLMapped() override
 			{
+				sAocCache.clear();
+				sAocCacheGenerated = false;
 				cafeExportRegister("nn_aoc", AOC_CalculateWorkBufferSize, LogType::NN_AOC);
 				cafeExportRegister("nn_aoc", AOC_ListTitle, LogType::NN_AOC);
 
diff --git a/src/Cafe/OS/libs/nn_fp/nn_fp.cpp b/src/Cafe/OS/libs/nn_fp/nn_fp.cpp
index 8d059373..c2913196 100644
--- a/src/Cafe/OS/libs/nn_fp/nn_fp.cpp
+++ b/src/Cafe/OS/libs/nn_fp/nn_fp.cpp
@@ -781,6 +781,7 @@ namespace nn
 				g_fp.initCounter = 0;
 				g_fp.isAdminMode = false;
 				g_fp.isLoggedIn = false;
+				g_fp.fpdHandle = 0;
 				g_fp.getNotificationCalled = false;
 				g_fp.notificationHandler = nullptr;
 				g_fp.notificationHandlerParam = nullptr;