# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1135924730 0
# Node ID 6359ac574acf80c9a631f2f27976ddd87828f6f3
# Parent  dc3a189e9e3a2711b27471c0c8737d4e213037d3
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

diff -r dc3a189e9e3a -r 6359ac574acf lisp/server.el
--- a/lisp/server.el	Fri Dec 30 06:15:47 2005 +0000
+++ b/lisp/server.el	Fri Dec 30 06:38:50 2005 +0000
@@ -752,12 +752,13 @@
 		(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