branch: externals/crdt
commit 3ba890658d657db5d6aaedd5c2a78b6f93a5f139
Merge: e6d42f42c5 9fdef6c11b
Author: Qiantan Hong <qh...@alum.mit.edu>
Commit: Qiantan Hong <qh...@alum.mit.edu>
Merge branch 'master' into 'master'
Send leave message to Tuntox proxy, and ensure session is stopped
See merge request qhong/crdt.el!5
---
crdt.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/crdt.el b/crdt.el
index d83f3bfde9..12a4df6554 100644
--- a/crdt.el
+++ b/crdt.el
@@ -2081,10 +2081,11 @@ Handle received STRING from PROCESS."
(process-get process 'crdt--downgrade-continuation))
;; This should only happens when we are in the middle of TLS
handshake
(funcall (process-get process 'crdt--downgrade-continuation))
- (when (process-get process 'tuntox-process)
- (process-send-string
- process
- (crdt--format-message `(leave ,(crdt--session-local-id
session)))))
+ (with-demoted-errors "CRDT Error: %S"
+ (when (process-get process 'tuntox-process)
+ (process-send-string
+ (process-get process 'tuntox-process)
+ (crdt--format-message `(leave ,(crdt--session-local-id
session))))))
(crdt--stop-session session))))))
;;; UI commands
