mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Fix double reconnection bug
* rcirc.el (rcirc-sentinel): Don't reconnect if reconnecting (reconnect): Use delete-process instead of kill-process
This commit is contained in:
parent
2ef6691602
commit
a66fd7bb37
1 changed files with 5 additions and 8 deletions
|
|
@ -841,7 +841,8 @@ When 0, do not auto-reconnect."
|
|||
(not rcirc-target))
|
||||
(rcirc-disconnect-buffer)))
|
||||
(when (and (string= sentinel "deleted")
|
||||
(< 0 rcirc-reconnect-delay))
|
||||
(< 0 rcirc-reconnect-delay)
|
||||
(not rcirc-connecting))
|
||||
(let ((now (current-time)))
|
||||
(when (or (null rcirc-last-connect-time)
|
||||
(time-less-p rcirc-reconnect-delay
|
||||
|
|
@ -2580,13 +2581,9 @@ to `rcirc-default-part-reason'."
|
|||
(interactive "i")
|
||||
(with-rcirc-server-buffer
|
||||
(catch 'exit
|
||||
(cond
|
||||
(rcirc-connecting
|
||||
(when (process-live-p process)
|
||||
(kill-process process))
|
||||
(setq rcirc-connecting nil))
|
||||
((process-live-p process)
|
||||
(throw 'exit (message "Server process is alive"))))
|
||||
(if (eq (process-status process) 'open)
|
||||
(throw 'exit (message "Server process is alive"))
|
||||
(delete-process process))
|
||||
(let ((conn-info rcirc-connection-info))
|
||||
(setf (nth 5 conn-info)
|
||||
(cl-remove-if-not #'rcirc-channel-p
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue