Don't display the splash screen when no frame was created. (Fixes tty resume.)

* lisp/server.el (server-process-filter): Don't display the splash screen
  when no frame was created.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-479

1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 68c267047fc..a6271c6d00a 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -752,12 +752,13 @@ The following commands are accepted by the client:
                 (setq buffers (server-visit-files files client nowait))
                 (run-hooks 'post-command-hook))
 
-              (with-selected-frame frame
-                (switch-to-buffer (or (car buffers)
-                                      (get-buffer-create "*scratch*")))
-                (unless inhibit-splash-screen
-                  (display-splash-screen))
-                (display-startup-echo-area-message))
+              (when frame
+                (with-selected-frame frame
+                  (switch-to-buffer (or (car buffers)
+                                        (get-buffer-create "*scratch*")))
+                  (unless inhibit-splash-screen
+                    (display-splash-screen))
+                  (display-startup-echo-area-message)))
 
               ;; Delete the client if necessary.
               (cond