diff options
| author |  Sadie Powell | 2022-02-01 16:00:54 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-02-01 16:00:54 +0000 |
| commit | 95868f7458e03f76dc6babfcefa993a63fb31b56 (patch) | |
| tree | e57400d2509f8016a6591e1ea5185eb5beb6cbf7 /src/modules/m_spanningtree/treeserver.cpp | |
| parent | The target in OnDecodeMetaData can be nullptr sometimes. (diff) | |
| parent | Fix splitting servers multiple times in some cases. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree/treeserver.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/treeserver.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index dfe7edb3d..e56eb4d67 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -200,6 +200,10 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason, bool void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error) { + // Don't squit a server which is already dead. + if (isdead) + return; + ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Server %s lost in split", GetName().c_str()); for (const auto& server : Children) |