From 150d1bcdd5081f71444a39c725288ee8841a8eb2 Mon Sep 17 00:00:00 2001
From: Eladash <elad3356p@gmail.com>
Date: Tue, 24 Mar 2020 14:55:40 +0200
Subject: [PATCH] sys_prx_unload_module: Implement CELL_PRX_ERROR_NOT_REMOVABLE

---
 rpcs3/Emu/Cell/lv2/sys_prx.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
index c249699d9b..f635f4b568 100644
--- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
@@ -446,13 +446,29 @@ error_code _sys_prx_unload_module(u32 id, u64 flags, vm::ptr<sys_prx_unload_modu
 	sys_prx.todo("_sys_prx_unload_module(id=0x%x, flags=0x%x, pOpt=*0x%x)", id, flags, pOpt);
 
 	// Get the PRX, free the used memory and delete the object and its ID
-	const auto prx = idm::withdraw<lv2_obj, lv2_prx>(id);
+	const auto prx = idm::withdraw<lv2_obj, lv2_prx>(id, [](lv2_prx& prx) -> CellPrxError
+	{
+		switch (prx.state)
+		{
+		case PRX_STATE_INITIALIZED:
+		case PRX_STATE_STOPPED:
+			return {};
+		default: break;
+		}
+
+		return CELL_PRX_ERROR_NOT_REMOVABLE;
+	});
 
 	if (!prx)
 	{
 		return CELL_PRX_ERROR_UNKNOWN_MODULE;
 	}
 
+	if (prx.ret)
+	{
+		return prx.ret;
+	}
+
 	ppu_unload_prx(*prx);
 
 	//s32 result = prx->exit ? prx->exit() : CELL_OK;