From 9ab9585f1ab15617360c791560033282cd56ac80 Mon Sep 17 00:00:00 2001 From: Pawel Polanski Date: Tue, 8 Feb 2011 10:42:03 +0100 Subject: [PATCH] Symbian: Not killing the panicked as it results in CODA crash --- src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp index cc67ce29ac..8882ac1e5f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp @@ -173,14 +173,13 @@ void CodaRunControl::slotError(const QString &error) void CodaRunControl::slotTrkLogMessage(const QString &log) { - if (debug) { + if (debug > 1) qDebug("CODA log: %s", qPrintable(log.size()>200?log.left(200).append(QLatin1String(" ...")): log)); - } } void CodaRunControl::slotSerialPong(const QString &message) { - if (debug) + if (debug > 1) qDebug() << "CODA serial pong:" << message; } @@ -255,12 +254,14 @@ void CodaRunControl::handleContextSuspended(const CodaEvent &event) const TcfSuspendEvent &me = static_cast(event); switch (me.reason()) { + case TcfSuspendEvent::Other: case TcfSuspendEvent::Crash: appendMessage(tr("Thread has crashed: %1").arg(QString::fromLatin1(me.message())), ErrorMessageFormat); - //If we get a crash report then we display it and stop the process. - //Now sure if this should be the final solution but it works for now. - //m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automaticly - stop(); + + if (me.reason() == TcfSuspendEvent::Crash) + stop(); + else + m_codaDevice->sendRunControlResumeCommand(CodaCallback(), me.id()); //TODO: Should I resume automaticly break; default: if (debug) -- 2.11.0