From 80a78c509f56a38ec4866935b7ad6822a0479b85 Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Sat, 21 Feb 2026 19:57:18 +0900
Subject: [PATCH] [XMA] Write back output_buffer_read_offset in
 StoreContextMerged

---
 src/xenia/apu/xma_context_new.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/xenia/apu/xma_context_new.cc b/src/xenia/apu/xma_context_new.cc
index f8b1ebaa9..d714e1438 100644
--- a/src/xenia/apu/xma_context_new.cc
+++ b/src/xenia/apu/xma_context_new.cc
@@ -906,6 +906,9 @@ void XmaContextNew::StoreContextMerged(const XMA_CONTEXT_DATA& data,
   // DWORD 4: decoder owns current_buffer
   fresh.current_buffer = data.current_buffer;
 
+  // DWORD 9: decoder owns output_buffer_read_offset (reset by ClearLocked)
+  fresh.output_buffer_read_offset = data.output_buffer_read_offset;
+
   fresh.Store(context_ptr);
 }