[elpa] master b5a9dc5 255/272: ivy.el (ivy--reset-state): file-directory-p needs a string

[Oleh Krehel]

branch: master
commit b5a9dc5c0776259113ecccacb7410262266dc971
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy--reset-state): file-directory-p needs a string
---
 ivy.el |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ivy.el b/ivy.el
index 22deab9..1a9ba33 100644
--- 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)))