From 937af7984f4ec23ae03ba801e20674d73be2f55b Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xTVaser@users.noreply.github.com>
Date: Sat, 9 Mar 2024 19:31:00 -0500
Subject: [PATCH] g/j2: workaround intermittent lifeseed DMA crash (#3418)

This is not a fix, but it temporarily works around the potential crash
discussed here https://github.com/open-goal/jak-project/issues/2988

As long as this doesn't impact other things, this feels like a good
interim fix, as having a broken cutscene is better than a fatal crash
and it might be some time before this is properly identified and fixed.
---
 game/overlord/jak2/dma.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/game/overlord/jak2/dma.cpp b/game/overlord/jak2/dma.cpp
index d7fc5be9a8..93b4942f13 100644
--- a/game/overlord/jak2/dma.cpp
+++ b/game/overlord/jak2/dma.cpp
@@ -1,5 +1,8 @@
 #include "dma.h"
 
+#include "common/log/log.h"
+#include "common/util/string_util.h"
+
 #include "game/overlord/jak2/ssound.h"
 #include "game/overlord/jak2/vag.h"
 #include "game/sound/sdshim.h"
@@ -69,6 +72,14 @@ int SpuDmaIntr(int, void*) {
 
       // start the transfer!
       pending_dma = kDmaDelay;
+      // TODO - temporary hack, `channel` being set to -1 is what causes the lifeseed cutscene crash
+      // narrow down why/where -1 is coming from
+      // - https://github.com/open-goal/jak-project/issues/2988
+      if (chan < 0) {
+        lg::error("SND-ERROR: channel was invalid: {} for command: {}", chan,
+                  DmaStereoVagCmd->name);
+        return -1;
+      }
       sceSdVoiceTrans((int)chan, 0, iop_ptr, spu_addr, old_xfer);
       // and return. This will get called again on completion
       return 0;