diff options
| author | lethality <lethality@anope.org> | 2010-08-02 15:13:37 +0100 |
|---|---|---|
| committer | lethality <lethality@anope.org> | 2010-08-02 15:13:37 +0100 |
| commit | ddb886aa99a5bbdfbac8a1d3738e296d1ade7af4 (patch) | |
| tree | c4454e9521b9f8f33a42dc7b0a0d798b78886a26 /src | |
| parent | 80f0351a8b6643b35d7dfe7081238922333a54f1 (diff) | |
| parent | 48d58d9b88868da70ba8966df539c86f737a7f73 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/chanserv.cpp | 2 | ||||
| -rw-r--r-- | src/init.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/chanserv.cpp b/src/chanserv.cpp index 07ebe9525..8e2014426 100644 --- a/src/chanserv.cpp +++ b/src/chanserv.cpp @@ -249,7 +249,7 @@ void chanserv(User *u, const Anope::string &buf) { Anope::string command = buf; command.erase(command.begin()); - command.erase(command.end()); + command.erase(command.end() - 1); ircdproto->SendCTCP(ChanServ, u->nick, "%s", command.c_str()); } else diff --git a/src/init.cpp b/src/init.cpp index 811981a32..e64a622d9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -355,7 +355,11 @@ int init_primary(int ac, char **av) ModuleManager::LoadModuleList(Config.DBModuleList); /* Load the socket engine */ - ModuleManager::LoadModule(Config.SocketEngine, NULL); + if (ModuleManager::LoadModule(Config.SocketEngine, NULL)) + { + Alog(LOG_TERMINAL) << "Unable to load socket engine " << Config.SocketEngine; + return -1; + } return 0; } |