ivy.el (ivy--reset-state): file-directory-p needs a string

diff --git a/ivy.el b/ivy.el
index 22deab9a5d3298ef0725480a5b46149af01e7034..1a9ba33d9815c1646e3dfc70ecaaf35319440c63 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -1400,11 +1400,11 @@ This is useful for recursive `ivy-read'."
                                 :test #'equal)))
                (setq coll (all-completions "" collection predicate))))
             ((eq collection 'read-file-name-internal)
-             (setq ivy--directory
-                   (if (file-directory-p initial-input)
-                       (prog1 initial-input
-                         (setq initial-input nil))
-                     default-directory))
+             (if (and initial-input (file-directory-p initial-input))
+                 (progn
+                   (setq ivy--directory initial-input)
+                   (setq initial-input nil))
+               (setq ivy--directory default-directory))
              (require 'dired)
              (when preselect
                (let ((preselect-directory (file-name-directory preselect)))