diff options
| author |  Sadie Powell | 2019-05-15 16:22:24 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-05-15 21:06:09 +0100 |
| commit | 03d3563ef95efc6ab8076d66ebda48545c6089c4 (patch) | |
| tree | 0160e0a3b333a000c7c880d9373b46cfa3968e79 /src/inspircd.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| download | inspircd++-03d3563ef95efc6ab8076d66ebda48545c6089c4.tar.gz inspircd++-03d3563ef95efc6ab8076d66ebda48545c6089c4.tar.bz2 inspircd++-03d3563ef95efc6ab8076d66ebda48545c6089c4.zip | |
Replace socketengine_{pthread,win32} with C++11 threads.
Diffstat (limited to 'src/inspircd.cpp')
| -rw-r--r-- | src/inspircd.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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(); |