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 91abd41eab
commit ef1041a47f
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

@ -2,6 +2,7 @@
Bugfixes: Bugfixes:
- 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:
- Qt: Don't rebuild library view if style hasn't changed - Qt: Don't rebuild library view if style hasn't changed

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

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