* lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).

1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 39dc92fabe2..540d0e3b11d 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -733,6 +733,10 @@ if different)."
         (condition-case err
             (unless (or (eq frame this)
                         (eq frame mini)
+                        ;; Don't delete daemon's initial frame, or
+                        ;; we'll never be able to close the last
+                        ;; client's frame (Bug#26912).
+                        (if (daemonp) (not (frame-parameter frame 'client)))
                         (frame-parameter frame 'desktop-dont-clear))
               (delete-frame frame))
           (error