From cf7a24ab92b96ef8174383fcc00d00dadd6ec173 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Sun, 17 Oct 2021 02:17:02 -0700
Subject: [PATCH] zsh: add safeguards to auto directory save/load

---
 .zshrc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.zshrc b/.zshrc
index 39a72e9..1ca3f3f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -668,10 +668,12 @@ load_working_dir() {
       if test -d "$(cat "$WORKING_DIR_SAVE_FILE")"; then
          cd "$PREVIOUS_WORKING_DIR" || error $LINENO
       else
-         echo "Invalid saved working directory ($PREVIOUS_WORKING_DIR)"
+         echo "Invalid saved working directory ($PREVIOUS_WORKING_DIR)" > /dev/null
+         return 1
       fi
    else
-      echo "Invalid working directory save file ($WORKING_DIR_SAVE_FILE)"
+      echo "Invalid working directory save file ($WORKING_DIR_SAVE_FILE)" > /dev/null
+      return 1
    fi
 }
 
@@ -682,8 +684,8 @@ save_working_dir() {
 autoload -U add-zsh-hook
 add-zsh-hook chpwd save_working_dir
 
-load_working_dir
-cd - > /dev/null
+load_working_dir &&
+   cd - > /dev/null
 # <<<
 # <<<