From 03d3563ef95efc6ab8076d66ebda48545c6089c4 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 15 May 2019 16:22:24 +0100 Subject: Replace socketengine_{pthread,win32} with C++11 threads. --- src/inspircd.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/inspircd.cpp') diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 23e543dab..3468ca7f3 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -588,13 +588,9 @@ void InspIRCd::Run() if (this->ConfigThread && this->ConfigThread->IsDone()) { /* Rehash has completed */ - this->Logs.Log("CONFIG", LOG_DEBUG, "Detected ConfigThread exiting, tidying up..."); - - this->ConfigThread->Finish(); - - ConfigThread->join(); - delete ConfigThread; - ConfigThread = NULL; + this->Logs.Log("CONFIG", LOG_DEBUG, "New configuration has been read, applying..."); + ConfigThread->Stop(); + DeleteZero(ConfigThread); } UpdateTime(); -- cgit v1.3.1-10-gc9f91