From 5a6ee3aadc2abce53f03416a2da3f5c14bb03d75 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 9 Oct 2017 11:36:55 -0700
Subject: [PATCH] Python: Fix debugger not properly attaching core

---
 src/platform/python/mgba/core.py     | 5 ++++-
 src/platform/python/mgba/debugger.py | 2 +-
 src/platform/python/mgba/gb.py       | 4 ++--
 src/platform/python/mgba/gba.py      | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/platform/python/mgba/core.py b/src/platform/python/mgba/core.py
index 837f4188f..84f59caa3 100644
--- a/src/platform/python/mgba/core.py
+++ b/src/platform/python/mgba/core.py
@@ -152,6 +152,9 @@ class Core(object):
             return GB(core)
         return Core(core)
 
+    def _load(self):
+        self._wasReset = True
+
     def loadFile(self, path):
         return bool(lib.mCoreLoadFile(self._core, path.encode('UTF-8')))
 
@@ -193,7 +196,7 @@ class Core(object):
 
     def reset(self):
         self._core.reset(self._core)
-        self._wasReset = True
+        self._load()
 
     @needsReset
     @protected
diff --git a/src/platform/python/mgba/debugger.py b/src/platform/python/mgba/debugger.py
index 2d597491c..17f4d5017 100644
--- a/src/platform/python/mgba/debugger.py
+++ b/src/platform/python/mgba/debugger.py
@@ -41,7 +41,7 @@ class NativeDebugger(IRunner):
         self._native = native
         self._cbs = []
         self._core = Core._detect(native.core)
-        self._core._wasReset = True
+        self._core._load()
 
     def pause(self):
         lib.mDebuggerEnter(self._native, lib.DEBUGGER_ENTER_MANUAL, ffi.NULL)
diff --git a/src/platform/python/mgba/gb.py b/src/platform/python/mgba/gb.py
index f70f9173f..47b9e09ff 100644
--- a/src/platform/python/mgba/gb.py
+++ b/src/platform/python/mgba/gb.py
@@ -36,8 +36,8 @@ class GB(Core):
         if self._wasReset:
             self._native.video.renderer.cache = ffi.NULL
 
-    def reset(self):
-        super(GB, self).reset()
+    def _load(self):
+        super(GB, self)._load()
         self.memory = GBMemory(self._core)
 
     def attachSIO(self, link):
diff --git a/src/platform/python/mgba/gba.py b/src/platform/python/mgba/gba.py
index bbe544683..29f233f99 100644
--- a/src/platform/python/mgba/gba.py
+++ b/src/platform/python/mgba/gba.py
@@ -44,8 +44,8 @@ class GBA(Core):
         if self._wasReset:
             self._native.video.renderer.cache = ffi.NULL
 
-    def reset(self):
-        super(GBA, self).reset()
+    def _load(self):
+        super(GBA, self)._load()
         self.memory = GBAMemory(self._core, self._native.memory.romSize)
 
     def attachSIO(self, link, mode=lib.SIO_MULTI):