[Emacs-diffs] emacs-25 ff5f37e 2/2: Don't bug out in erc after waking from sleep

[Lars Ingebrigtsen]

branch: emacs-25
commit ff5f37e56a1df53dbc15c8590d904ac37a82a335
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Don't bug out in erc after waking from sleep
    
    * erc-backend.el (erc-server-send-ping): If the server has
    closed connection, this may already have been detected and
    `erc-server-last-received-time' has been set to nil (bug#13608).
---
 lisp/erc/erc-backend.el |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index daaa1b0..df957d1 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -805,7 +805,9 @@ protection algorithm."
 (defun erc-server-send-ping (buf)
   "Send a ping to the IRC server buffer in BUF.
 Additionally, detect whether the IRC process has hung."
-  (if (buffer-live-p buf)
+  (if (and (buffer-live-p buf)
+           (with-current-buffer buf
+             erc-server-last-received-time))
       (with-current-buffer buf
         (if (and erc-server-send-ping-timeout
                  (>