From 855923e4b03385fe22139ca25850be8b9953ad81 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Thu, 4 Jun 2015 23:37:42 -0700
Subject: [PATCH] GBA Memory: Fix potential DMA issue when loading a savestate

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

diff --git a/CHANGES b/CHANGES
index f36a0637c..7fb7276b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Bugfixes:
  - GBA: Check for improperly sized savestates when loading
  - GBA: Check for savestates made from differently sized ROMs
  - GBA Video: Fix out-of-bounds tiles in mosaic
+ - GBA Memory: Fix potential DMA issue when loading a savestate
 Misc:
  - Qt: Handle saving input settings better
  - Debugger: Free watchpoints in addition to breakpoints
diff --git a/src/gba/io.c b/src/gba/io.c
index 2a841e4b8..c9957f301 100644
--- a/src/gba/io.c
+++ b/src/gba/io.c
@@ -704,5 +704,6 @@ void GBAIODeserialize(struct GBA* gba, const struct GBASerializedState* state) {
 			gba->timersEnabled |= 1 << i;
 		}
 	}
+	GBAMemoryUpdateDMAs(gba, 0);
 	GBAHardwareDeserialize(&gba->memory.hw, state);
 }