From 7c48f9c5675e42bc4b5c9eeb382f6f869c25190a Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Jul 2016 13:48:24 +0200 Subject: [PATCH] QNX: Prevent crash on failing attach to running process Change-Id: Ibe8c8e83f81e7111bdd782881eb9f44df71521fe Reviewed-by: Andy Shaw --- src/plugins/qnx/qnxattachdebugsupport.cpp | 5 +++++ src/plugins/qnx/qnxplugin.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qnx/qnxattachdebugsupport.cpp b/src/plugins/qnx/qnxattachdebugsupport.cpp index 87ded8d789f..74ec041beb5 100644 --- a/src/plugins/qnx/qnxattachdebugsupport.cpp +++ b/src/plugins/qnx/qnxattachdebugsupport.cpp @@ -141,6 +141,11 @@ void QnxAttachDebugSupport::attachToProcess() stopPDebug(); return; } + if (!runControl) { + handleError(tr("Attaching failed.")); + stopPDebug(); + return; + } connect(runControl, &Debugger::DebuggerRunControl::stateChanged, this, &QnxAttachDebugSupport::handleDebuggerStateChanged); ProjectExplorerPlugin::startRunControl(runControl, ProjectExplorer::Constants::DEBUG_RUN_MODE); diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index cb457b72109..06c58ef173d 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -115,6 +115,6 @@ void QnxPlugin::updateDebuggerActions() } } - m_attachToQnxApplication->setVisible(hasValidQnxKit); - m_debugSeparator->setVisible(hasValidQnxKit); + m_attachToQnxApplication->setVisible(false && hasValidQnxKit); // FIXME + m_debugSeparator->setVisible(false && hasValidQnxKit); // FIXME QTCREATORBUG-16608 }