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

ProjectExplorer: Avoid soft assert when creating new project

Browse Source 
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>
This commit is contained in:
Christian Stenger
2018-03-09 09:13:33 +01:00
parent a40ea3f1d6
commit 964476983e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
View File

@@ -290,6 +290,7 @@ void JsonWizard::accept()
openFiles(m_files); openFiles(m_files);
auto node = static_cast<ProjectExplorer::Node*>(value(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE).value<void*>()); auto node = static_cast<ProjectExplorer::Node*>(value(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE).value<void*>());
if (node) // PREFERRED_PROJECT_NODE is not set for newly created projects
openProjectForNode(node); openProjectForNode(node);
} }
@@ -389,8 +390,6 @@ void JsonWizard::openProjectForNode(Node *node)
{ {
using namespace Utils; using namespace Utils;
QTC_ASSERT(node, return); // may happend when no project is opened
ProjectNode *projNode = node->asProjectNode() ? node->asProjectNode() : node->parentProjectNode(); ProjectNode *projNode = node->asProjectNode() ? node->asProjectNode() : node->parentProjectNode();
QTC_ASSERT(projNode, return); QTC_ASSERT(projNode, return);