forked from qt-creator/qt-creator
Removed m_codaSocketIODevice from CodaGdbAdapter
because it served no useful purpose and was causing a crash
This commit is contained in:
committed by
Pawel Polanski
parent
2cc342a882
commit
a6637d1575
@@ -1040,7 +1040,6 @@ void CodaGdbAdapter::startAdapter()
|
|||||||
setupTrkDeviceSignals();
|
setupTrkDeviceSignals();
|
||||||
codaSocket = QSharedPointer<QTcpSocket>(new QTcpSocket);
|
codaSocket = QSharedPointer<QTcpSocket>(new QTcpSocket);
|
||||||
m_codaDevice->setDevice(codaSocket);
|
m_codaDevice->setDevice(codaSocket);
|
||||||
m_codaSocketIODevice = codaSocket;
|
|
||||||
} else {
|
} else {
|
||||||
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()
|
m_codaDevice = SymbianUtils::SymbianDeviceManager::instance()
|
||||||
->getCodaDevice(parameters.remoteChannel);
|
->getCodaDevice(parameters.remoteChannel);
|
||||||
@@ -1213,22 +1212,6 @@ void CodaGdbAdapter::cleanup()
|
|||||||
{
|
{
|
||||||
delete m_gdbServer;
|
delete m_gdbServer;
|
||||||
m_gdbServer = 0;
|
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) {
|
if (m_codaDevice) {
|
||||||
// Ensure process is stopped after being suspended.
|
// Ensure process is stopped after being suspended.
|
||||||
sendRunControlTerminateCommand();
|
sendRunControlTerminateCommand();
|
||||||
|
|||||||
@@ -147,7 +147,6 @@ private:
|
|||||||
int m_stopReason;
|
int m_stopReason;
|
||||||
|
|
||||||
QSharedPointer<Coda::CodaDevice> m_codaDevice;
|
QSharedPointer<Coda::CodaDevice> m_codaDevice;
|
||||||
QSharedPointer<QIODevice> m_codaSocketIODevice;
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Gdb
|
// Gdb
|
||||||
|
|||||||
Reference in New Issue
Block a user