summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-24 19:04:13 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-24 19:04:13 +0000
commit1deb30602a6b68b857f64763351fac63032c22ff (patch)
treeb249e0c3f020713334bd3ad492f3ea3764fb98c3
parent81b10b90490e54545d026dfc1cf60453090f1e3a (diff)
Yay, local /rehash is now fixed :)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9028 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/commands/cmd_rehash.cpp2
-rw-r--r--src/configreader.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 868a4aea2..53d19765a 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -50,7 +50,7 @@ CmdResult CommandRehash::Handle (const char* const* parameters, int pcnt, User *
else
{
/* A rehash is already in progress! ahh shit. */
- user->WriteServ("*** NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick);
+ user->WriteServ("NOTICE %s :*** Could not rehash: A rehash is already in progress.", user->nick);
return CMD_FAILURE;
}
}
diff --git a/src/configreader.cpp b/src/configreader.cpp
index a34713279..11c74f88c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -2193,5 +2193,8 @@ void ConfigReaderThread::Run()
{
/* TODO: TheUser may be invalid by the time we get here! Check its validity, or pass a UID would be better */
ServerInstance->Config->Read(do_bail, TheUser);
+ ServerInstance->Threads->Mutex(true);
+ this->SetExitFlag();
+ ServerInstance->Threads->Mutex(false);
}