Merge remote-tracking branch 'origin/4.7' into 4.8

Change-Id: I9665e3ae097f3d472692254d7f1fee0fe5757fb5

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index c708dd5af4..894fadcfa4 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -31,6 +31,7 @@
 #include "../project.h"
 #include "../projectexplorer.h"
 #include "../projectexplorerconstants.h"
+#include "../projecttree.h"
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/messagemanager.h>
 
@@ -290,7 +291,7 @@ void JsonWizard::accept()
     openFiles(m_files);
 
     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
+    if (node && ProjectTree::hasNode(node)) // PREFERRED_PROJECT_NODE is not set for newly created projects
         openProjectForNode(node);
 }