From af4638e83fe885182e658fe6adc77f22e08b9874 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Fri, 18 Feb 2022 16:40:26 +0100
Subject: [PATCH] naomi2: fix another initdv2 end of race crash

---
 core/hw/pvr/elan.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/hw/pvr/elan.cpp b/core/hw/pvr/elan.cpp
index 3c21f5424..3f374da61 100644
--- a/core/hw/pvr/elan.cpp
+++ b/core/hw/pvr/elan.cpp
@@ -1446,7 +1446,8 @@ static void sendPolygon(ICHList *list)
 
 	default:
 		WARN_LOG(PVR, "Unhandled poly format %x", list->flags);
-		die("Unsupported");
+		// initdv2 crash (area conquered screen after the 4th race)
+		//die("Unsupported");
 		break;
 	}
 	envMapping = false;
@@ -1570,13 +1571,16 @@ static void executeCommand(u8 *data, int size)
 							WARN_LOG(PVR, "Unknown interrupt mask %x", wait->mask);
 							// initdv2j: happens at end of race, garbage data after end of model due to wrong size?
 							//die("unexpected");
-							inter = holly_OPAQUE;
+							inter = (HollyInterruptID)-1;
 							break;
 						}
-						asic_RaiseInterruptBothCLX(inter);
-						TA_ITP_CURRENT += 32;
-						if (Active)
-							state.reset();
+						if (inter != (HollyInterruptID)-1)
+						{
+							asic_RaiseInterruptBothCLX(inter);
+							TA_ITP_CURRENT += 32;
+							if (Active)
+								state.reset();
+						}
 					}
 					size -= sizeof(RegisterWait);
 				}