From 9e7b7592364f6ca009631983e423c76aa078bf1c Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Thu, 4 Apr 2024 23:23:06 +0200
Subject: [PATCH] cellGame: Enable disc insert/eject based on disc mount state

---
 rpcs3/Emu/Cell/Modules/cellGame.cpp | 14 +++++++++++---
 rpcs3/Emu/Cell/Modules/cellGame.h   |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp
index dce605f808..0e5f83959c 100644
--- a/rpcs3/Emu/Cell/Modules/cellGame.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp
@@ -239,8 +239,15 @@ error_code disc_change_manager::register_callbacks(vm::ptr<CellGameDiscEjectCall
 	eject_callback = func_eject;
 	insert_callback = func_insert;
 
-	Emu.GetCallbacks().enable_disc_eject(!!func_eject);
-	Emu.GetCallbacks().enable_disc_insert(false);
+	const bool is_disc_mounted = fs::is_dir(vfs::get("/dev_bdvd/PS3_GAME"));
+
+	if (state == eject_state::unknown)
+	{
+		state = is_disc_mounted ? eject_state::inserted : eject_state::ejected;
+	}
+
+	Emu.GetCallbacks().enable_disc_eject(!!func_eject && is_disc_mounted);
+	Emu.GetCallbacks().enable_disc_insert(!!func_insert && !is_disc_mounted);
 
 	return CELL_OK;
 }
@@ -300,7 +307,8 @@ void disc_change_manager::eject_disc()
 		ensure(vfs::unmount("/dev_ps2disc"));
 		dcm.state = eject_state::ejected;
 
-		Emu.GetCallbacks().enable_disc_insert(true);
+		// Re-enable disc insertion only if the callback is still registered
+		Emu.GetCallbacks().enable_disc_insert(!!dcm.insert_callback);
 
 		return CELL_OK;
 	});
diff --git a/rpcs3/Emu/Cell/Modules/cellGame.h b/rpcs3/Emu/Cell/Modules/cellGame.h
index a9bbc0666d..a0506cef9d 100644
--- a/rpcs3/Emu/Cell/Modules/cellGame.h
+++ b/rpcs3/Emu/Cell/Modules/cellGame.h
@@ -338,11 +338,12 @@ struct disc_change_manager
 
 	enum class eject_state
 	{
+		unknown,
 		inserted,
 		ejected,
 		busy
 	};
-	atomic_t<eject_state> state = eject_state::inserted;
+	atomic_t<eject_state> state = eject_state::unknown;
 
 	error_code register_callbacks(vm::ptr<CellGameDiscEjectCallback> func_eject, vm::ptr<CellGameDiscInsertCallback> func_insert);
 	error_code unregister_callbacks();