[XMA] Fix recursive lock acquisition in new decoder

2026-02-09 18:04:34 +09:00
parent abaa0e4c96
commit ea056849fa
2 changed files with 6 additions and 1 deletions
--- a/src/xenia/apu/xma_context_new.cc
+++ b/src/xenia/apu/xma_context_new.cc
@@ -131,7 +131,7 @@ bool XmaContextNew::Work() {
  if (data.IsConsumeOnlyContext()) {
    Consume(&output_rb, &data);
    if (data.output_buffer_read_offset == data.output_buffer_write_offset) {
-      Clear();
+      ClearLocked();
    }
    data.Store(context_ptr);
    return true;
@@ -217,6 +217,10 @@ bool XmaContextNew::Block(bool poll) {

 void XmaContextNew::Clear() {
  std::lock_guard<xe_mutex> lock(lock_);
+  ClearLocked();
+}
+
+void XmaContextNew::ClearLocked() {
  XELOGAPU("XmaContext: reset context {}", id());

  auto context_ptr = memory()->TranslateVirtual(guest_ptr());