From 45493adfd24c61ee2ea551435d0f138e8c3137bb Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Mon, 28 Sep 2015 17:36:51 +0300
Subject: [PATCH] set conda default location creating conda env

---
 .../python/sdk/AbstractCreateVirtualEnvDialog.java     |  2 +-
 .../com/jetbrains/python/sdk/CreateCondaEnvDialog.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/sdk/AbstractCreateVirtualEnvDialog.java b/python/src/com/jetbrains/python/sdk/AbstractCreateVirtualEnvDialog.java
index ec069ff17c47..fe0d9e50fc71 100644
--- a/python/src/com/jetbrains/python/sdk/AbstractCreateVirtualEnvDialog.java
+++ b/python/src/com/jetbrains/python/sdk/AbstractCreateVirtualEnvDialog.java
@@ -128,7 +128,7 @@ public abstract class AbstractCreateVirtualEnvDialog extends IdeaDialog {
     new LocationNameFieldsBinding(project, myDestination, myName, myInitialPath, "Select Location for Virtual Environment");
   }
 
-  private void setInitialDestination() {
+  protected void setInitialDestination() {
     myInitialPath = "";
 
     final VirtualFile file = VirtualEnvSdkFlavor.getDefaultLocation();
diff --git a/python/src/com/jetbrains/python/sdk/CreateCondaEnvDialog.java b/python/src/com/jetbrains/python/sdk/CreateCondaEnvDialog.java
index e1f74649d843..37c9620424ab 100644
--- a/python/src/com/jetbrains/python/sdk/CreateCondaEnvDialog.java
+++ b/python/src/com/jetbrains/python/sdk/CreateCondaEnvDialog.java
@@ -20,9 +20,11 @@ import com.intellij.facet.ui.FacetValidatorsManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.ui.ComboBox;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.components.JBLabel;
 import com.jetbrains.python.packaging.PyCondaPackageManagerImpl;
+import com.jetbrains.python.sdk.flavors.VirtualEnvSdkFlavor;
 import com.jetbrains.python.validation.UnsupportedFeaturesUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -55,6 +57,14 @@ public class CreateCondaEnvDialog extends AbstractCreateVirtualEnvDialog {
     checkValid();
   }
 
+  @Override
+  protected void setInitialDestination() {
+    final List<VirtualFile> locations = VirtualEnvSdkFlavor.getCondaDefaultLocations();
+    if (!locations.isEmpty()) {
+      myInitialPath = locations.get(0).getPath();
+    }
+  }
+
   protected void layoutPanel(final List<Sdk> allSdks) {
     final GridBagConstraints c = new GridBagConstraints();
     c.fill = GridBagConstraints.HORIZONTAL;