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

[Stefan Kangas]

branch: master
commit ca0a8b554a6e56dc988fcafc0778de373ff53489
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    ; * lib-src/emacsclient.c (main): Fix previous change.
---
 lib-src/emacsclient.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2e5d8d0cc2..9529b34725 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",