Commit a6637d15 authored by Tom Sutcliffe's avatar Tom Sutcliffe Committed by Pawel Polanski
Browse files

Removed m_codaSocketIODevice from CodaGdbAdapter

because it served no useful purpose and was causing a crash
parent 2cc342a8
......@@ -1040,7 +1040,6 @@ void CodaGdbAdapter::startAdapter()
setupTrkDeviceSignals();
codaSocket = QSharedPointer<QTcpSocket>(new QTcpSocket);
m_codaDevice->setDevice(codaSocket);
m_codaSocketIODevice = codaSocket;
} else {
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()
->getCodaDevice(parameters.remoteChannel);
......@@ -1213,22 +1212,6 @@ void CodaGdbAdapter::cleanup()
{
delete m_gdbServer;
m_gdbServer = 0;
if (!m_codaSocketIODevice.isNull()) {
QAbstractSocket *socket =
qobject_cast<QAbstractSocket *>(m_codaSocketIODevice.data());
const bool isOpen = socket
? socket->state() == QAbstractSocket::ConnectedState
: m_codaSocketIODevice->isOpen();
if (isOpen) {
// Ensure process is stopped after being suspended.
sendRunControlTerminateCommand();
if (socket) {
socket->disconnect();
} else {
m_codaSocketIODevice->close();
}
}
} //!m_trkIODevice.isNull()
if (m_codaDevice) {
// Ensure process is stopped after being suspended.
sendRunControlTerminateCommand();
......
......@@ -147,7 +147,6 @@ private:
int m_stopReason;
QSharedPointer<Coda::CodaDevice> m_codaDevice;
QSharedPointer<QIODevice> m_codaSocketIODevice;
//
// Gdb
......
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