From e42eb66f1f0c43b18a68858b3dcf37a8e9f78a5c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 24 Oct 2014 16:13:24 +0200
Subject: [PATCH] JsonProjectPage: Pick right directory

Pick the correct directory when the wizard is started via the context
menu of an project node.

Change-Id: Ib2ebba5f796381217673c9030a7b279b6d764a59
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 .../projectexplorer/jsonwizard/jsonprojectpage.cpp    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp
index ce6e1f79d0f..4aaf185be35 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp
@@ -32,6 +32,8 @@
 
 #include <coreplugin/documentmanager.h>
 
+#include <utils/qtcassert.h>
+
 #include <QDir>
 #include <QVariant>
 
@@ -43,12 +45,9 @@ JsonProjectPage::JsonProjectPage(QWidget *parent) :
 
 void JsonProjectPage::initializePage()
 {
-    if (Core::DocumentManager::useProjectsDirectory()) {
-        setPath(Core::DocumentManager::projectsDirectory());
-    } else {
-        if (JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard()))
-            setPath(wiz->value(QLatin1String("InitialPath")).toString());
-    }
+    JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
+    QTC_ASSERT(wiz, return);
+    setPath(wiz->value(QLatin1String("InitialPath")).toString());
 
     setProjectName(uniqueProjectName(path()));
 }