aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/jsonwizard
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2018-03-09 09:13:33 +0100
committerChristian Stenger <christian.stenger@qt.io>2018-03-09 12:57:48 +0000
commit964476983e9ddce64aad635ec515a00f7ce15e1a (patch)
treea6d9315488f007e668855aee45db4567665b819f /src/plugins/projectexplorer/jsonwizard
parenta40ea3f1d603d6f43c73346f87ed0e5038c32538 (diff)
ProjectExplorer: Avoid soft assert when creating new project
Remove soft assert and do a pre-check before calling the function. Change-Id: I9882e841a47a5b7bc566f1b3a4b156df4229f051 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index 0686c0caee..c708dd5af4 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -290,7 +290,8 @@ void JsonWizard::accept()
openFiles(m_files);
auto node = static_cast<ProjectExplorer::Node*>(value(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE).value<void*>());
- openProjectForNode(node);
+ if (node) // PREFERRED_PROJECT_NODE is not set for newly created projects
+ openProjectForNode(node);
}
void JsonWizard::reject()
@@ -389,8 +390,6 @@ void JsonWizard::openProjectForNode(Node *node)
{
using namespace Utils;
- QTC_ASSERT(node, return); // may happend when no project is opened
-
ProjectNode *projNode = node->asProjectNode() ? node->asProjectNode() : node->parentProjectNode();
QTC_ASSERT(projNode, return);