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

Qt: Handle interrupting CLI debugger better (fixes #697)

This commit is contained in:
Vicki Pfau 2017-04-22 18:40:55 -07:00
parent 36c66e7db4
commit 6fb7c0780a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,10 +80,11 @@ const char* DebuggerConsoleController::readLine(struct CLIDebuggerBackend* be, s
while (self->m_lines.isEmpty()) {
self->m_cond.wait(&self->m_mutex);
}
self->m_last = self->m_lines.takeFirst().toUtf8();
if (self->m_last.isEmpty()) {
self->m_last = "\n";
QString last = self->m_lines.takeFirst();
if (last.isNull()) {
return nullptr;
}
self->m_last = last.toUtf8();
*len = self->m_last.size();
return self->m_last.constData();
@ -101,7 +102,7 @@ const char* DebuggerConsoleController::historyLast(struct CLIDebuggerBackend* be
GameController::Interrupter interrupter(self->m_gameController, true);
QMutexLocker lock(&self->m_mutex);
if (self->m_history.isEmpty()) {
return "\n";
return "i";
}
self->m_last = self->m_history.last().toUtf8();
return self->m_last.constData();