From 7388326bcab9278cb65ca5e003a0f309dd66d18d Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Fri, 8 Feb 2019 17:49:57 +0100 Subject: [PATCH 1/2] Fix crash while quitting debugging Task-number: QTCREATORBUG-21684 Change-Id: I2a51d0666f2a591daeec34fc88ee12aa50265ff3 Reviewed-by: Alexandru Croitor --- src/plugins/debugger/threadshandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/threadshandler.cpp b/src/plugins/debugger/threadshandler.cpp index a37d6fbe1d9..42acf73b872 100644 --- a/src/plugins/debugger/threadshandler.cpp +++ b/src/plugins/debugger/threadshandler.cpp @@ -409,7 +409,7 @@ void ThreadsHandler::setThreads(const GdbMi &data) if (!m_currentThread && threads.childCount() > 0) m_currentThread = rootItem()->childAt(0); - if (!m_currentThread) { + if (m_currentThread) { const QModelIndex currentThreadIndex = m_currentThread->index(); threadSwitcher()->setCurrentIndex(currentThreadIndex.row()); } From b71a6eec20ffca672e6b43f9eea78fd694cc3c7f Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sat, 9 Feb 2019 07:12:06 +0100 Subject: [PATCH 2/2] ExternalToolConfig: Fix choosing executable Somehow the function to select the executable broke and changed to "Choose Directory". Fixes: QTCREATORBUG-21937 Change-Id: Ifc596df276a3e26bb063d5b856fca29f9db227df Reviewed-by: Orgad Shaneh Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/externaltoolconfig.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 9b17d200032..9be71177294 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -402,6 +402,7 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) : m_model(new ExternalToolModel(this)) { ui->setupUi(this); + ui->executable->setExpectedKind(Utils::PathChooser::ExistingCommand); ui->scrollArea->viewport()->setAutoFillBackground(false); ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->toolTree->setModel(m_model);