summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-07-28 14:45:37 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-07-28 14:45:37 +0200
commit7bef57c770fd5cdfa0ad10caf30273f6e42a90d7 (patch)
tree91a164d0bf3149cd19a2f79a6764a7db371c06b0 /src
parent634f44bb84d76e051e7393fd013d6a86419fb9ce (diff)
m_spanningtree Remove the now needless SplitInProgress workaround
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_spanningtree/main.cpp1
-rw-r--r--src/modules/m_spanningtree/main.h4
-rw-r--r--src/modules/m_spanningtree/treeserver.cpp4
3 files changed, 0 insertions, 9 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 64479163c..0747b96a6 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -40,7 +40,6 @@ ModuleSpanningTree::ModuleSpanningTree()
, currmembid(0)
, DNS(this, "DNS")
, loopCall(false)
- , SplitInProgress(false)
{
}
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index f25370b93..09a42ff0d 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -82,10 +82,6 @@ class ModuleSpanningTree : public Module
*/
bool loopCall;
- /** True if users are quitting due to a netsplit
- */
- bool SplitInProgress;
-
/** Constructor
*/
ModuleSpanningTree();
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 0acffbb70..9b92ba988 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -185,11 +185,7 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
server->SQuitInternal(num_lost_servers);
const std::string quitreason = GetName() + " " + server->GetName();
-
- ModuleSpanningTree* st = Utils->Creator;
- st->SplitInProgress = true;
unsigned int num_lost_users = QuitUsers(quitreason);
- st->SplitInProgress = false;
ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%u\002 user%s on \002%u\002 server%s.",
num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");