Merge pull request #2011 from zooba/issue-2010

Fixes #2010 Interpreter link crashes when path variable not set
microsoft · Jan 4, 2017 · 2555122 · 2555122
2 parents b4d4d0c + f7b9ecd
commit 2555122
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Python/Product/PythonTools/PythonTools/InterpreterList/InterpreterListToolWindow.cs b/Python/Product/PythonTools/PythonTools/InterpreterList/InterpreterListToolWindow.cs
@@ -284,16 +284,18 @@ sealed class InterpreterListToolWindow : ToolWindowPane {
                 factory.Configuration.WindowsInterpreterPath;
             psi.WorkingDirectory = factory.Configuration.PrefixPath;
 
-            var provider = _service.KnownProviders.OfType<LoadedProjectInterpreterFactoryProvider>().FirstOrDefault();
-            var vsProject = provider == null ?
-                null :
-                provider.GetProject(factory);
-            var project = vsProject == null ? null : vsProject.GetPythonProject();
-            if (project != null) {
-                psi.EnvironmentVariables[factory.Configuration.PathEnvironmentVariable] = 
-                    string.Join(";", project.GetSearchPaths());
-            } else {
-                psi.EnvironmentVariables[factory.Configuration.PathEnvironmentVariable] = string.Empty;
+            var pathVar = factory.Configuration.PathEnvironmentVariable;
+            if (!string.IsNullOrEmpty(pathVar)) {
+                var provider = _service.KnownProviders.OfType<LoadedProjectInterpreterFactoryProvider>().FirstOrDefault();
+                var vsProject = provider == null ?
+                    null :
+                    provider.GetProject(factory);
+                var project = vsProject == null ? null : vsProject.GetPythonProject();
+                if (project != null) {
+                    psi.EnvironmentVariables[pathVar] = string.Join(";", project.GetSearchPaths());
+                } else {
+                    psi.EnvironmentVariables[pathVar] = string.Empty;
+                }
             }
 
             Process.Start(psi);