From 0798f7413ce924edc80db138ffd65255caa481c9 Mon Sep 17 00:00:00 2001
From: Xandor Schiefer <me@xandor.co.za>
Date: Mon, 14 Nov 2016 19:18:24 +0200
Subject: [PATCH] Upon load, don't change current node version if already set
 by nvm

---
 nvm.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nvm.sh b/nvm.sh
index 1a6798f..29e2acd 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -3216,6 +3216,8 @@ nvm_supports_xz() {
 }
 
 nvm_auto() {
+  local NVM_CURRENT
+  NVM_CURRENT="$(nvm_ls_current)"
   local NVM_MODE
   NVM_MODE="${1-}"
   local VERSION
@@ -3227,7 +3229,11 @@ nvm_auto() {
       nvm install >/dev/null
     fi
   elif [ "_$NVM_MODE" = '_use' ]; then
-   VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
+    if [ "_$NVM_CURRENT" != '_system' ]; then
+      VERSION="$NVM_CURRENT"
+    else
+      VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
+    fi
     if [ -n "$VERSION" ]; then
       nvm use --silent "$VERSION" >/dev/null
     elif nvm_rc_version >/dev/null 2>&1; then