From 5c82ae3e686e1974dc10aa59161aa517b10d79a9 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Fri, 24 Jan 2020 22:16:02 -0800
Subject: [PATCH] GBA Serialize: Fix audio DMA timing deserialization

---
 CHANGES      | 1 +
 src/gba/io.c | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 89a11e2ba..596cf1fc3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 Emulation fixes:
  - GBA Memory: Misaligned SRAM writes are ignored
  - GBA Serialize: Fix serializing DMA transfer register
+ - GBA Serialize: Fix audio DMA timing deserialization
 Other fixes:
  - Qt: Only dynamically reset video scale if a game is running
  - Qt: Fix race condition with proxied video events
diff --git a/src/gba/io.c b/src/gba/io.c
index 01333ba37..65cf1e6bc 100644
--- a/src/gba/io.c
+++ b/src/gba/io.c
@@ -988,9 +988,6 @@ void GBAIODeserialize(struct GBA* gba, const struct GBASerializedState* state) {
 		LOAD_32(gba->memory.dma[i].nextDest, 0, &state->dma[i].nextDest);
 		LOAD_32(gba->memory.dma[i].nextCount, 0, &state->dma[i].nextCount);
 		LOAD_32(gba->memory.dma[i].when, 0, &state->dma[i].when);
-		if (GBADMARegisterGetTiming(gba->memory.dma[i].reg) != GBA_DMA_TIMING_NOW) {
-			GBADMASchedule(gba, i, &gba->memory.dma[i]);
-		}
 	}
 	GBAAudioWriteSOUNDCNT_X(&gba->audio, gba->memory.io[REG_SOUNDCNT_X >> 1]);