From 6693157258b29915c2de6868bcf77cd71e2bc476 Mon Sep 17 00:00:00 2001 From: Wim Date: Mon, 15 Apr 2019 23:28:47 +0200 Subject: Fix deadlock on reconnect (irc). Closes #757 --- bridge/irc/handlers.go | 5 ++++- matterbridge.toml.sample | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go index ce4f0445..1d260071 100644 --- a/bridge/irc/handlers.go +++ b/bridge/irc/handlers.go @@ -156,7 +156,10 @@ func (b *Birc) handleOtherAuth(client *girc.Client, event girc.Event) { b.handleNickServ() b.handleRunCommands() // we are now fully connected - b.connected <- nil + // only send on first connection + if b.FirstConnection { + b.connected <- nil + } } func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) { diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 3b4dc407..ac334cce 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -27,7 +27,7 @@ UseTLS=false #OPTIONAL (default false) UseSASL=false -#Enable to not verify the certificate on your irc server. i +#Enable to not verify the certificate on your irc server. #e.g. when using selfsigned certificates #OPTIONAL (default false) SkipTLSVerify=true -- cgit v1.2.3