feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

further cleanups in less expected shutdown paths

Browse Source 
Reviewed-by: hjk
This commit is contained in:
Oswald Buddenhagen
2009-11-09 22:07:56 +01:00
parent 97618ec493
commit 23e06304f8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -285,6 +285,8 @@ void GdbEngine::initializeVariables()
m_inbuffer.clear(); m_inbuffer.clear();
m_commandTimer->stop();
// ConverterState has no reset() function. // ConverterState has no reset() function.
m_outputCodecState.~ConverterState(); m_outputCodecState.~ConverterState();
new (&m_outputCodecState) QTextCodec::ConverterState(); new (&m_outputCodecState) QTextCodec::ConverterState();
@@ -1456,6 +1458,7 @@ void GdbEngine::shutdown()
case InferiorRunning: case InferiorRunning:
case InferiorStopping: case InferiorStopping:
case InferiorStopped: case InferiorStopped:
m_commandsToRunOnTemporaryBreak.clear();
postCommand(_(m_gdbAdapter->inferiorShutdownCommand()), postCommand(_(m_gdbAdapter->inferiorShutdownCommand()),
NeedsStop | LosesChild, CB(handleInferiorShutdown)); NeedsStop | LosesChild, CB(handleInferiorShutdown));
break; break;
@@ -1496,6 +1499,7 @@ void GdbEngine::handleGdbExit(const GdbResponse &response)
{ {
if (response.resultClass == GdbResultExit) { if (response.resultClass == GdbResultExit) {
debugMessage(_("GDB CLAIMS EXIT; WAITING")); debugMessage(_("GDB CLAIMS EXIT; WAITING"));
m_commandsDoneCallback = 0;
// don't set state here, this will be handled in handleGdbFinished() // don't set state here, this will be handled in handleGdbFinished()
} else { } else {
QString msg = m_gdbAdapter->msgGdbStopFailed(_(response.data.findChild("msg").data())); QString msg = m_gdbAdapter->msgGdbStopFailed(_(response.data.findChild("msg").data()));