nn_act: Handle incorrect slot 0 for PersistentId

cemu-project · Aug 3, 2023 · 67819a6 · 67819a6
1 parent 651e533
commit 67819a6
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/Cafe/IOSU/legacy/iosu_act.cpp b/src/Cafe/IOSU/legacy/iosu_act.cpp
@@ -623,10 +623,19 @@ int iosuAct_thread()
 			}
 			else if (actCemuRequest->requestCode == IOSU_ARC_PERSISTENTID)
 			{
-				accountIndex = iosuAct_getAccountIndexBySlot(actCemuRequest->accountSlot);
-				_cancelIfAccountDoesNotExist();
-				actCemuRequest->resultU32.u32 = _actAccountData[accountIndex].persistentId;
-				actCemuRequest->setACTReturnCode(0);
+				if(actCemuRequest->accountSlot != 0)
+				{
+					accountIndex = iosuAct_getAccountIndexBySlot(actCemuRequest->accountSlot);
+					_cancelIfAccountDoesNotExist();
+					actCemuRequest->resultU32.u32 = _actAccountData[accountIndex].persistentId;
+					actCemuRequest->setACTReturnCode(0);
+				}
+				else
+				{
+					// F1 Race Stars calls IsSlotOccupied and indirectly GetPersistentId on slot 0 which is not valid
+					actCemuRequest->resultU32.u32 = 0;
+					actCemuRequest->setACTReturnCode(0);
+				}
 			}
 			else if (actCemuRequest->requestCode == IOSU_ARC_COUNTRY)
 			{