Merge pull request #3164 from nailor/fix-deactivate-bug

virtualenvwrapper: Deactivate only if in virtualenv
11 years ago · 13e5afe805
parent 811f1f9eb9 833e6f5958
commit 13e5afe805
1 changed files with 1 additions and 1 deletions
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@ -38,7 +38,7 @@ if (( $+commands[$virtualenvwrapper] )); then
                source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
              fi
            fi
-          elif [ $CD_VIRTUAL_ENV ]; then
+          elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
            # We've just left the repo, deactivate the environment
            # Note: this only happens if the virtualenv was activated automatically
            deactivate && unset CD_VIRTUAL_ENV