diff options
| author | Wim <wim@42.be> | 2019-04-15 23:28:47 +0200 |
|---|---|---|
| committer | Wim <wim@42.be> | 2019-04-15 23:28:47 +0200 |
| commit | 380c38674c19d741b344c627a2db7f8f34d223d3 (patch) | |
| tree | 4aadc5a15158bc96c8c18d1d47d46ba6359fba11 | |
| parent | 3c14a0891e7304b9daa80ba0533474c49c11a29e (diff) | |
| download | matterbridge-msglm-380c38674c19d741b344c627a2db7f8f34d223d3.tar.gz matterbridge-msglm-380c38674c19d741b344c627a2db7f8f34d223d3.tar.bz2 matterbridge-msglm-380c38674c19d741b344c627a2db7f8f34d223d3.zip | |
Fix deadlock on reconnect (irc). Closes #757
| -rw-r--r-- | bridge/irc/handlers.go | 5 | ||||
| -rw-r--r-- | 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 eed54f3a..6531acef 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -29,7 +29,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 |