From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 7 Sep 2022 00:59:50 +0000 (+0200)
Subject: ; * lib-src/emacsclient.c (main): Fix previous change.
X-Git-Tag: emacs-29.0.90~1856^2~687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca0a8b554a6e56dc988fcafc0778de373ff53489;p=emacs.git

; * lib-src/emacsclient.c (main): Fix previous change.
---

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2e5d8d0cc24..9529b34725b 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -2149,9 +2149,9 @@ main (int argc, char **argv)
 	  act_on_signals (emacs_socket);
 	  rl = recv (emacs_socket, string, BUFSIZ, 0);
 	  retry = check_socket_timeout (rl);
-	  if (retry)
+	  if (retry && !saw_response)
 	    {
-	      if (timeout > 0 && !saw_response)
+	      if (timeout > 0)
 		{
 		  /* Don't retry if we were given a --timeout flag.  */
 		  fprintf (stderr, "\nServer not responding; timed out after %lu seconds",