Fix desktop saving and restoring in daemon sessions

* lisp/desktop.el (desktop--check-dont-save): Don't save daemon's
initial frame.
* lisp/frameset.el (frameset-restore): Don't try deleting the
daemon's initial frame.  (Bug#80294)

1 files changed, 12 insertions, 3 deletions

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 85a90f67c68..e11a1da7e9b 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1362,9 +1362,18 @@ All keyword parameters default to nil."
     ;; Clean up the frame list
     (when cleanup-frames
       (let ((map nil)
-	    (cleanup (if (eq cleanup-frames t)
-			 (lambda (frame action)
-			   (when (memq action '(:rejected :ignored))
+	    (cleanup
+             (if (eq cleanup-frames t)
+		 (lambda (frame action)
+		   (when (and (memq action '(:rejected :ignored))
+                              ;; Don't try deleting the daemon's initial
+                              ;; frame, as that would only trigger
+                              ;; warnings.
+                              (not
+                               (and (daemonp)
+                                    (equal (terminal-name (frame-terminal
+                                                           frame))
+                                           "initial_terminal"))))
 			     (delete-frame frame)))
 		       cleanup-frames)))
 	(maphash (lambda (frame _action) (push frame map)) frameset--action-map)