From 67de8c742516f82bab776e029abf353784ba0321 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 5 Oct 2016 00:01:53 -0700
Subject: [PATCH] GB: Reset active region when reloading ROM

---
 CHANGES     | 1 +
 src/gb/gb.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index d66552044..1161c1caf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,7 @@ Misc:
  - All: Split out install locations for Libretro and OpenEmu
  - Qt: Manage window sizes slightly better
  - Qt: Remember scale option independent of core dimensions
+ - GB: Reset active region when reloading ROM
 
 0.5.0: (2016-09-19)
 Features:
diff --git a/src/gb/gb.c b/src/gb/gb.c
index f8b69c460..89b92a254 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -102,6 +102,11 @@ bool GBLoadROM(struct GB* gb, struct VFile* vf) {
 	gb->memory.romSize = gb->pristineRomSize;
 	gb->romCrc32 = doCrc32(gb->memory.rom, gb->memory.romSize);
 
+	if (gb->cpu) {
+		struct LR35902Core* cpu = gb->cpu;
+		cpu->memory.setActiveRegion(cpu, cpu->pc);
+	}
+
 	// TODO: error check
 	return true;
 }