all repos — mgba @ 56475e578bc27ab79aa34047dda1bf6c3fbd4106

mGBA Game Boy Advance Emulator

Qt: Fix crash when starting GDB stub after closing a game
Jeffrey Pfau jeffrey@endrift.com
Sat, 21 Feb 2015 02:01:55 -0800
commit

56475e578bc27ab79aa34047dda1bf6c3fbd4106

parent

2235dcf2ab8b848ea80815a93af97a84835c3b61

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -42,6 +42,7 @@ - GBA Thread: Fix possible deadlock in video sync

- GBA: Fix savestate loading of DISPSTAT and WAITCNT registers - Qt: Fix crash starting a GDB stub if a game isn't loaded - Qt: Fix crash when adjusting settings after closing a game + - Qt: Fix crash when starting GDB stub after closing a game Misc: - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples - GBA Memory: Simplify memory API and use fixed bus width
M src/platform/qt/GameController.cppsrc/platform/qt/GameController.cpp

@@ -170,11 +170,11 @@ }

void GameController::setDebugger(ARMDebugger* debugger) { threadInterrupt(); - if (m_threadContext.debugger && GBAThreadHasStarted(&m_threadContext)) { + if (m_threadContext.debugger && GBAThreadIsActive(&m_threadContext)) { GBADetachDebugger(m_threadContext.gba); } m_threadContext.debugger = debugger; - if (m_threadContext.debugger && GBAThreadHasStarted(&m_threadContext)) { + if (m_threadContext.debugger && GBAThreadIsActive(&m_threadContext)) { GBAAttachDebugger(m_threadContext.gba, m_threadContext.debugger); } threadContinue();