aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-10-18 11:34:39 +0200
committerEike Ziller <eike.ziller@qt.io>2018-10-18 12:30:04 +0000
commit4dbc62a47e3e43e489b5a3b89f308bf8292285d9 (patch)
treed254591d4f1b4e45e4aa414afc4d0c9ce536c14c
parent5bc38589d8049d10d5c8401c27e576c5029aeacf (diff)
Fix soft assert when adding file to subfolder in generic project
We can only select a node directly in the wizard summary page's project tree, if that is actually listed there. Task-number: QTCREATORBUG-21342 Change-Id: I52b3db8c38ae2bb59b3f6856e79354ca60a00140 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--src/plugins/projectexplorer/projectwizardpage.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index 062439db64..24b84a23d9 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -456,10 +456,11 @@ void ProjectWizardPage::initializeProjectTree(Node *context, const QStringList &
}
root->prependChild(createNoneNode(&selector));
- // Set combobox to context node:
+ // Set combobox to context node if that appears in the tree:
auto predicate = [context](TreeItem *ti) { return static_cast<AddNewTree*>(ti)->node() == context; };
TreeItem *contextItem = root->findAnyChild(predicate);
- m_ui->projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem));
+ if (contextItem)
+ m_ui->projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem));
setAdditionalInfo(selector.deployingProjects());
setBestNode(selector.bestChoice());