ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix command line debugger closing second game

This commit is contained in:
Vicki Pfau 2017-07-23 00:01:18 -07:00
parent a77c021a85
commit 893fdd383f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -5,6 +5,7 @@ Bugfixes:
- GB Audio: Make audio unsigned with bias (fixes mgba.io/i/749) - GB Audio: Make audio unsigned with bias (fixes mgba.io/i/749)
- Python: Fix importing .gb or .gba before .core - Python: Fix importing .gb or .gba before .core
- GBA: Reset active region as needed when loading a ROM - GBA: Reset active region as needed when loading a ROM
- Qt: Fix command line debugger closing second game
Misc: Misc:
- GBA Timer: Use global cycles for timers - GBA Timer: Use global cycles for timers
- GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)

12
src/platform/qt/DebuggerConsoleController.cpp
View File

@ -39,8 +39,10 @@ void DebuggerConsoleController::enterLine(const QString& line) {
} }
void DebuggerConsoleController::detach() { void DebuggerConsoleController::detach() {
m_lines.append(QString()); if (m_cliDebugger.d.state != DEBUGGER_SHUTDOWN) {
m_cond.wakeOne(); m_lines.append(QString());
m_cond.wakeOne();
}
DebuggerController::detach(); DebuggerController::detach();
} }
@ -68,8 +70,10 @@ void DebuggerConsoleController::init(struct CLIDebuggerBackend* be) {
void DebuggerConsoleController::deinit(struct CLIDebuggerBackend* be) { void DebuggerConsoleController::deinit(struct CLIDebuggerBackend* be) {
Backend* consoleBe = reinterpret_cast<Backend*>(be); Backend* consoleBe = reinterpret_cast<Backend*>(be);
DebuggerConsoleController* self = consoleBe->self; DebuggerConsoleController* self = consoleBe->self;
self->m_lines.append(QString()); if (be->p->d.state != DEBUGGER_SHUTDOWN) {
self->m_cond.wakeOne(); self->m_lines.append(QString());
self->m_cond.wakeOne();
}
} }
const char* DebuggerConsoleController::readLine(struct CLIDebuggerBackend* be, size_t* len) { const char* DebuggerConsoleController::readLine(struct CLIDebuggerBackend* be, size_t* len) {