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

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2e5d8d0cc2495b10447b3ce13b52f76a016b3941..9529b34725be3f88a5e9e60cd9f859acf6c42345 100644 (file)
--- 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",