From ed041ba13a31f88d48e9aeb12bebed11c87ee00d Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 11 Nov 2016 11:30:04 +0100
Subject: [PATCH] Take ZDOTDIR value from EnvironmentUtil.getEnvironmentMap()
 (IDEA-162571)

---
 .../plugins/terminal/LocalTerminalDirectRunner.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 92acaac7586a..a617c35dd438 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -198,8 +198,9 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
             addRcFileArgument(envs, command, result, rcFilePath, "--rcfile");
           }
           else if (shellName.equals("zsh")) {
-            if (StringUtil.isNotEmpty(EnvironmentUtil.getEnvironmentMap().get(ZDOTDIR))) {
-              File zshRc = new File(FileUtil.expandUserHome(envs.get(ZDOTDIR)), ".zshrc");
+            String zdotdir = EnvironmentUtil.getEnvironmentMap().get(ZDOTDIR);
+            if (StringUtil.isNotEmpty(zdotdir)) {
+              File zshRc = new File(FileUtil.expandUserHome(zdotdir), ".zshrc");
               if (zshRc.exists()) {
                 envs.put(JEDITERM_USER_RCFILE, zshRc.getAbsolutePath());
               }