Commit 5ddf7d3c authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Symbian: Fix CODA shutdown after debuggee crash.

parent de9a5c9e
...@@ -988,10 +988,11 @@ void CodaGdbAdapter::sendRunControlTerminateCommand() ...@@ -988,10 +988,11 @@ void CodaGdbAdapter::sendRunControlTerminateCommand()
void CodaGdbAdapter::handleRunControlTerminate(const CodaCommandResult &) void CodaGdbAdapter::handleRunControlTerminate(const CodaCommandResult &)
{ {
QString msg = QString::fromLatin1("CODA disconnected"); QString msg = QString::fromLatin1("CODA disconnected");
const bool emergencyShutdown = m_gdbProc.state() != QProcess::Running; const bool emergencyShutdown = m_gdbProc.state() != QProcess::Running
&& state() != EngineShutdownOk;
if (emergencyShutdown) if (emergencyShutdown)
msg += QString::fromLatin1(" (emergency shutdown"); msg += QString::fromLatin1(" (emergency shutdown)");
logMessage(msg); logMessage(msg, LogMisc);
if (emergencyShutdown) { if (emergencyShutdown) {
cleanup(); cleanup();
m_engine->notifyAdapterShutdownOk(); m_engine->notifyAdapterShutdownOk();
......
...@@ -1752,6 +1752,10 @@ void GdbEngine::notifyAdapterShutdownFailed() ...@@ -1752,6 +1752,10 @@ void GdbEngine::notifyAdapterShutdownFailed()
void GdbEngine::notifyAdapterShutdownOk() void GdbEngine::notifyAdapterShutdownOk()
{ {
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state()); QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
if (state() != EngineShutdownRequested) {
qDebug("XXXXX");
showMessage(_("ASSERT"));
}
showMessage(_("INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2") showMessage(_("INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2")
.arg(lastGoodState()).arg(gdbProc()->state())); .arg(lastGoodState()).arg(gdbProc()->state()));
m_commandsDoneCallback = 0; m_commandsDoneCallback = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment