From dd1d4ce9738be9979472ddb7f8616a58b8044b14 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 11 Nov 2016 11:32:33 +0100
Subject: [PATCH] Take XDG_CONFIG_HOME value from
 EnvironmentUtil.getEnvironmentMap()

---
 .../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 a617c35dd438..3403ae7efbe3 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -208,8 +208,9 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
             envs.put(ZDOTDIR, new File(rcFilePath).getParent());
           }
           else if (shellName.equals("fish")) {
-            if (StringUtil.isNotEmpty(EnvironmentUtil.getEnvironmentMap().get(XDG_CONFIG_HOME))) {
-              File fishConfig = new File(new File(FileUtil.expandUserHome(envs.get(XDG_CONFIG_HOME)), "fish"), "config.fish");
+            String xdgConfig = EnvironmentUtil.getEnvironmentMap().get(XDG_CONFIG_HOME);
+            if (StringUtil.isNotEmpty(xdgConfig)) {
+              File fishConfig = new File(new File(FileUtil.expandUserHome(xdgConfig), "fish"), "config.fish");
               if (fishConfig.exists()) {
                 envs.put(JEDITERM_USER_RCFILE, fishConfig.getAbsolutePath());
               }