summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-04-15 23:28:47 +0200
committerWim <wim@42.be>2019-04-19 18:13:41 +0200
commit6693157258b29915c2de6868bcf77cd71e2bc476 (patch)
tree4e8312a4353351aeea769fe88117165bf97a1214
parente4d73b29a10d9816b4b45c48ab6629013ec9ccf0 (diff)
downloadmatterbridge-msglm-6693157258b29915c2de6868bcf77cd71e2bc476.tar.gz
matterbridge-msglm-6693157258b29915c2de6868bcf77cd71e2bc476.tar.bz2
matterbridge-msglm-6693157258b29915c2de6868bcf77cd71e2bc476.zip
Fix deadlock on reconnect (irc). Closes #757
-rw-r--r--bridge/irc/handlers.go5
-rw-r--r--matterbridge.toml.sample2
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