feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QNX: Prevent crash on failing attach to running process

Browse Source 
Change-Id: Ibe8c8e83f81e7111bdd782881eb9f44df71521fe
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
hjk
2016-07-15 13:48:24 +02:00
committed by hjk
parent 2b3d4685db
commit 7c48f9c567
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qnx/qnxattachdebugsupport.cpp
View File

@@ -141,6 +141,11 @@ void QnxAttachDebugSupport::attachToProcess()
stopPDebug(); stopPDebug();
return; return;
} }
if (!runControl) {
handleError(tr("Attaching failed."));
stopPDebug();
return;
}
connect(runControl, &Debugger::DebuggerRunControl::stateChanged, connect(runControl, &Debugger::DebuggerRunControl::stateChanged,
this, &QnxAttachDebugSupport::handleDebuggerStateChanged); this, &QnxAttachDebugSupport::handleDebuggerStateChanged);
ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::DEBUG_RUN_MODE); ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::DEBUG_RUN_MODE);

4
src/plugins/qnx/qnxplugin.cpp
View File

@@ -115,6 +115,6 @@ void QnxPlugin::updateDebuggerActions()
} }
} }
m_attachToQnxApplication->setVisible(hasValidQnxKit); m_attachToQnxApplication->setVisible(false && hasValidQnxKit); // FIXME
m_debugSeparator->setVisible(hasValidQnxKit); m_debugSeparator->setVisible(false && hasValidQnxKit); // FIXME QTCREATORBUG-16608
} }