From eeec6711e869575ca19355e46f2249c993c60980 Mon Sep 17 00:00:00 2001
From: Pawel Polanski <pawel.3.polanski@nokia.com>
Date: Wed, 9 Mar 2011 12:06:20 +0100
Subject: [PATCH] Symbian: Some small fixes in CODA debugging

---
 src/plugins/debugger/gdb/codagdbadapter.cpp             | 4 ++--
 src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp
index 69196ca3800..ed907b930be 100644
--- a/src/plugins/debugger/gdb/codagdbadapter.cpp
+++ b/src/plugins/debugger/gdb/codagdbadapter.cpp
@@ -299,7 +299,7 @@ void CodaGdbAdapter::handleTargetRemote(const GdbResponse &record)
         if (debug)
             qDebug() << "handleTargetRemote" << m_session.toString();
     } else {
-        QString msg = tr("Connecting to TRK server adapter failed:\n")
+        QString msg = tr("Connecting to CODA server adapter failed:\n")
             + QString::fromLocal8Bit(record.data.findChild("msg").data());
         m_engine->notifyInferiorSetupFailed(msg);
     }
@@ -1232,7 +1232,7 @@ void CodaGdbAdapter::shutdownAdapter()
         m_engine->notifyAdapterShutdownOk();
     } else {
         // Something is wrong, gdb crashed. Kill debuggee (see handleDeleteProcess2)
-        if (m_codaDevice->device()->isOpen()) {
+        if (m_codaDevice && m_codaDevice->device()->isOpen()) {
             logMessage("Emergency shutdown of CODA", LogError);
             sendRunControlTerminateCommand();
         }
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index 2cb0a78d54e..c5f4bb7f71a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -144,9 +144,8 @@ bool CodaRunControl::setupLauncher()
         codaSocket->connectToHost(m_address, m_port);
         m_state = StateConnecting;
         appendMessage(tr("Connecting to %1:%2...").arg(m_address).arg(m_port), NormalMessageFormat);
-
     }
-    QTimer::singleShot(4000, this, SLOT(checkForTimeout()));
+    QTimer::singleShot(5000, this, SLOT(checkForTimeout()));
     if (debug)
         m_codaDevice->setVerbose(debug);